14 files changed, 31 insertions, 91 deletions

diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 37ae175162f3..364f82b34d03 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -177,7 +177,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
         if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
                 return -ENODEV;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate memory for data structure");
                 return -ENOMEM;
@@ -189,14 +189,12 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
         data->urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!data->urb) {
                 BT_ERR("Can't allocate URB");
-                kfree(data);
                 return -ENOMEM;
         }
 
         if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) {
                 BT_ERR("Mini driver request failed");
                 usb_free_urb(data->urb);
-                kfree(data);
                 return -EIO;
         }
 
@@ -209,7 +207,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                 BT_ERR("Can't allocate memory for mini driver");
                 release_firmware(firmware);
                 usb_free_urb(data->urb);
-                kfree(data);
                 return -ENOMEM;
         }
 
@@ -224,7 +221,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                 BT_ERR("Firmware request failed");
                 usb_free_urb(data->urb);
                 kfree(data->buffer);
-                kfree(data);
                 return -EIO;
         }
 
@@ -236,7 +232,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
                 release_firmware(firmware);
                 usb_free_urb(data->urb);
                 kfree(data->buffer);
-                kfree(data);
                 return -ENOMEM;
         }
 
@@ -271,7 +266,6 @@ static void bcm203x_disconnect(struct usb_interface *intf)
         usb_free_urb(data->urb);
         kfree(data->fw_data);
         kfree(data->buffer);
-        kfree(data);
 }
 
 static struct usb_driver bcm203x_driver = {
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 32e825144fe9..995aee9cba22 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -653,7 +653,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         }
 
         /* Initialize control structure and load firmware */
-        data = kzalloc(sizeof(struct bfusb_data), GFP_KERNEL);
+        data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate memory for control structure");
                 goto done;
@@ -674,7 +674,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) {
                 BT_ERR("Firmware request failed");
-                goto error;
+                goto done;
         }
 
         BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
@@ -690,7 +690,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         hdev = hci_alloc_dev();
         if (!hdev) {
                 BT_ERR("Can't allocate HCI device");
-                goto error;
+                goto done;
         }
 
         data->hdev = hdev;
@@ -708,7 +708,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (hci_register_dev(hdev) < 0) {
                 BT_ERR("Can't register HCI device");
                 hci_free_dev(hdev);
-                goto error;
+                goto done;
         }
 
         usb_set_intfdata(intf, data);
@@ -718,9 +718,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 release:
         release_firmware(firmware);
 
-error:
-        kfree(data);
-
 done:
         return -EIO;
 }
@@ -741,7 +738,6 @@ static void bfusb_disconnect(struct usb_interface *intf)
 
         hci_unregister_dev(hdev);
         hci_free_dev(hdev);
-        kfree(data);
 }
 
 static struct usb_driver bfusb_driver = {
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 66c3a6770c41..0d26851d6e49 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb)
         case HCI_SCODATA_PKT:
                 hdev->stat.sco_tx++;
                 break;
-        };
+        }
 
         /* Prepend skb with frame type */
         memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
@@ -849,7 +849,7 @@ static int bluecard_probe(struct pcmcia_device *link)
         bluecard_info_t *info;
 
         /* Create new info device */
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -864,10 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 
 static void bluecard_detach(struct pcmcia_device *link)
 {
-        bluecard_info_t *info = link->priv;
-
         bluecard_release(link);
-        kfree(info);
 }
 
 
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 29caaed2d715..2fe4a8031348 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -443,7 +443,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
                 return -ENODEV;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -453,10 +453,8 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         init_usb_anchor(&data->rx_anchor);
 
         hdev = hci_alloc_dev();
-        if (!hdev) {
-                kfree(data);
+        if (!hdev)
                 return -ENOMEM;
-        }
 
         hdev->bus = HCI_USB;
         hci_set_drvdata(hdev, data);
@@ -475,7 +473,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
-                kfree(data);
                 return err;
         }
 
@@ -500,7 +497,6 @@ static void bpa10x_disconnect(struct usb_interface *intf)
         hci_free_dev(data->hdev);
         kfree_skb(data->rx_skb[0]);
         kfree_skb(data->rx_skb[1]);
-        kfree(data);
 }
 
 static struct usb_driver bpa10x_driver = {
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 8925b6d672a6..7ffd3f407144 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -638,7 +638,7 @@ static int bt3c_probe(struct pcmcia_device *link)
         bt3c_info_t *info;
 
         /* Create new info device */
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -654,10 +654,7 @@ static int bt3c_probe(struct pcmcia_device *link)
 
 static void bt3c_detach(struct pcmcia_device *link)
 {
-        bt3c_info_t *info = link->priv;
-
         bt3c_release(link);
-        kfree(info);
 }
 
 static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 6a9e9717d3ab..3f4bfc814dc7 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -600,8 +600,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
 exit:
         if (ret) {
                 hdev->stat.err_rx++;
-                if (skb)
-                        kfree_skb(skb);
+                kfree_skb(skb);
         }
 
         return ret;
@@ -956,11 +955,9 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
         BT_INFO("vendor=0x%x, device=0x%x, class=%d, fn=%d",
                         id->vendor, id->device, id->class, func->num);
 
-        card = kzalloc(sizeof(*card), GFP_KERNEL);
-        if (!card) {
-                ret = -ENOMEM;
-                goto done;
-        }
+        card = devm_kzalloc(&func->dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
 
         card->func = func;
 
@@ -974,8 +971,7 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
 
         if (btmrvl_sdio_register_dev(card) < 0) {
                 BT_ERR("Failed to register BT device!");
-                ret = -ENODEV;
-                goto free_card;
+                return -ENODEV;
         }
 
         /* Disable the interrupts on the card */
@@ -1023,9 +1019,6 @@ disable_host_int:
         btmrvl_sdio_disable_host_int(card);
 unreg_dev:
         btmrvl_sdio_unregister_dev(card);
-free_card:
-        kfree(card);
-done:
         return ret;
 }
 
@@ -1047,7 +1040,6 @@ static void btmrvl_sdio_remove(struct sdio_func *func)
                         BT_DBG("unregester dev");
                         btmrvl_sdio_unregister_dev(card);
                         btmrvl_remove_card(card->priv);
-                        kfree(card);
                 }
         }
 }
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index e10ea0347051..4a9909713874 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -304,7 +304,7 @@ static int btsdio_probe(struct sdio_func *func,
                 tuple = tuple->next;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&func->dev, sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -315,10 +315,8 @@ static int btsdio_probe(struct sdio_func *func,
         skb_queue_head_init(&data->txq);
 
         hdev = hci_alloc_dev();
-        if (!hdev) {
-                kfree(data);
+        if (!hdev)
                 return -ENOMEM;
-        }
 
         hdev->bus = HCI_SDIO;
         hci_set_drvdata(hdev, data);
@@ -340,7 +338,6 @@ static int btsdio_probe(struct sdio_func *func,
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
-                kfree(data);
                 return err;
         }
 
@@ -366,7 +363,6 @@ static void btsdio_remove(struct sdio_func *func)
         hci_unregister_dev(hdev);
 
         hci_free_dev(hdev);
-        kfree(data);
 }
 
 static struct sdio_driver btsdio_driver = {
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 21e803a6a281..35a553a90616 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb)
         case HCI_SCODATA_PKT:
                 hdev->stat.sco_tx++;
                 break;
-        };
+        }
 
         /* Prepend skb with frame type */
         memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
@@ -567,7 +567,7 @@ static int btuart_probe(struct pcmcia_device *link)
         btuart_info_t *info;
 
         /* Create new info device */
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -583,10 +583,7 @@ static int btuart_probe(struct pcmcia_device *link)
 
 static void btuart_detach(struct pcmcia_device *link)
 {
-        btuart_info_t *info = link->priv;
-
         btuart_release(link);
-        kfree(info);
 }
 
 static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 654e248763ef..debda27df9b0 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -96,11 +96,12 @@ static struct usb_device_id btusb_table[] = {
         { USB_DEVICE(0x0c10, 0x0000) },
 
         /* Broadcom BCM20702A0 */
+        { USB_DEVICE(0x04ca, 0x2003) },
         { USB_DEVICE(0x0489, 0xe042) },
         { USB_DEVICE(0x413c, 0x8197) },
 
         /* Foxconn - Hon Hai */
-        { USB_DEVICE(0x0489, 0xe033) },
+        { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
 
         /*Broadcom devices with vendor specific id */
         { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
@@ -956,7 +957,7 @@ static int btusb_probe(struct usb_interface *intf,
                         return -ENODEV;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -979,10 +980,8 @@ static int btusb_probe(struct usb_interface *intf,
                 }
         }
 
-        if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep) {
-                kfree(data);
+        if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep)
                 return -ENODEV;
-        }
 
         data->cmdreq_type = USB_TYPE_CLASS;
 
@@ -1002,10 +1001,8 @@ static int btusb_probe(struct usb_interface *intf,
         init_usb_anchor(&data->deferred);
 
         hdev = hci_alloc_dev();
-        if (!hdev) {
-                kfree(data);
+        if (!hdev)
                 return -ENOMEM;
-        }
 
         hdev->bus = HCI_USB;
         hci_set_drvdata(hdev, data);
@@ -1073,7 +1070,6 @@ static int btusb_probe(struct usb_interface *intf,
                                                         data->isoc, data);
                 if (err < 0) {
                         hci_free_dev(hdev);
-                        kfree(data);
                         return err;
                 }
         }
@@ -1081,7 +1077,6 @@ static int btusb_probe(struct usb_interface *intf,
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
-                kfree(data);
                 return err;
         }
 
@@ -1114,7 +1109,6 @@ static void btusb_disconnect(struct usb_interface *intf)
                 usb_driver_release_interface(&btusb_driver, data->isoc);
 
         hci_free_dev(hdev);
-        kfree(data);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
index 88694697f34f..60abf596f60e 100644
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
@@ -297,16 +297,14 @@ static int bt_ti_probe(struct platform_device *pdev)
         struct hci_dev *hdev;
         int err;
 
-        hst = kzalloc(sizeof(struct ti_st), GFP_KERNEL);
+        hst = devm_kzalloc(&pdev->dev, sizeof(struct ti_st), GFP_KERNEL);
         if (!hst)
                 return -ENOMEM;
 
         /* Expose "hciX" device to user space */
         hdev = hci_alloc_dev();
-        if (!hdev) {
-                kfree(hst);
+        if (!hdev)
                 return -ENOMEM;
-        }
 
         BT_DBG("hdev %p", hdev);
 
@@ -321,7 +319,6 @@ static int bt_ti_probe(struct platform_device *pdev)
         err = hci_register_dev(hdev);
         if (err < 0) {
                 BT_ERR("Can't register HCI device error %d", err);
-                kfree(hst);
                 hci_free_dev(hdev);
                 return err;
         }
@@ -347,7 +344,6 @@ static int bt_ti_remove(struct platform_device *pdev)
         hci_unregister_dev(hdev);
 
         hci_free_dev(hdev);
-        kfree(hst);
 
         dev_set_drvdata(&pdev->dev, NULL);
         return 0;
@@ -362,21 +358,7 @@ static struct platform_driver btwilink_driver = {
         },
 };
 
-/* ------- Module Init/Exit interfaces ------ */
-static int __init btwilink_init(void)
-{
-        BT_INFO("Bluetooth Driver for TI WiLink - Version %s", VERSION);
-
-        return platform_driver_register(&btwilink_driver);
-}
-
-static void __exit btwilink_exit(void)
-{
-        platform_driver_unregister(&btwilink_driver);
-}
-
-module_init(btwilink_init);
-module_exit(btwilink_exit);
+module_platform_driver(btwilink_driver);
 
 /* ------ Module Info ------ */
 
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 97a7784db4a2..036cb366fe6e 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -550,7 +550,7 @@ static int dtl1_probe(struct pcmcia_device *link)
         dtl1_info_t *info;
 
         /* Create new info device */
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -569,7 +569,6 @@ static void dtl1_detach(struct pcmcia_device *link)
 
         dtl1_close(info);
         pcmcia_disable_device(link);
-        kfree(info);
 }
 
 static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 74e0966b3ead..c8abce3d2d9c 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -531,7 +531,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
         default:
                 err = n_tty_ioctl_helper(tty, file, cmd, arg);
                 break;
-        };
+        }
 
         return err;
 }
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index ff6d589c34a5..cfc767938589 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -481,7 +481,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
                         hu->hdev->stat.err_rx++;
                         ptr++; count--;
                         continue;
-                };
+                }
 
                 ptr++; count--;
 
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 3f72595a6017..d8b7aed6e4a9 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -156,7 +156,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,
         case HCI_SCODATA_PKT:
                 data->hdev->stat.sco_tx++;
                 break;
-        };
+        }
 
         return total;
 }