Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / drivers / bluetooth / bfusb.c

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 61b591470a90827280005b50b000907a7e7c2ac2..a323baee51b03493facfb5def8708127e42d64ba 100644 (file)
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -751,9 +751,7 @@ static void bfusb_disconnect(struct usb_interface *intf)
 
        bfusb_close(hdev);
 
-       if (hci_unregister_dev(hdev) < 0)
-               BT_ERR("Can't unregister HCI device %s", hdev->name);
-
+       hci_unregister_dev(hdev);
        hci_free_dev(hdev);
 }
 
@@ -764,26 +762,7 @@ static struct usb_driver bfusb_driver = {
        .id_table       = bfusb_table,
 };
 
-static int __init bfusb_init(void)
-{
-       int err;
-
-       BT_INFO("BlueFRITZ! USB driver ver %s", VERSION);
-
-       err = usb_register(&bfusb_driver);
-       if (err < 0)
-               BT_ERR("Failed to register BlueFRITZ! USB driver");
-
-       return err;
-}
-
-static void __exit bfusb_exit(void)
-{
-       usb_deregister(&bfusb_driver);
-}
-
-module_init(bfusb_init);
-module_exit(bfusb_exit);
+module_usb_driver(bfusb_driver);
 
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);