return fw_cdev_major;
        }
 
-       retval = fw_core_add_address_handler(&topology_map,
-                                            &topology_map_region);
-       BUG_ON(retval < 0);
-
-       retval = fw_core_add_address_handler(®isters,
-                                            ®isters_region);
-       BUG_ON(retval < 0);
-
-       /* Add the vendor textual descriptor. */
-       retval = fw_core_add_descriptor(&vendor_id_descriptor);
-       BUG_ON(retval < 0);
-       retval = fw_core_add_descriptor(&model_id_descriptor);
-       BUG_ON(retval < 0);
+       fw_core_add_address_handler(&topology_map, &topology_map_region);
+       fw_core_add_address_handler(®isters, ®isters_region);
+       fw_core_add_descriptor(&vendor_id_descriptor);
+       fw_core_add_descriptor(&model_id_descriptor);
 
        return 0;
 }