Bluetooth: Remove HCI-owner field

After unregistering an hci_dev object a bluetooth driver does not have
any callbacks in the hci_dev structure left over. Therefore, there is no
need to keep a reference to the module.

Previously, we needed this to protect the hci-destruct callback.
However, this callback is no longer available so we do not need this
owner field, anymore.  Drivers now call hci_unregister_dev() and they
are done with the object.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

14 files changed, 3 insertions, 35 deletions

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index e99ce89e1cad..c7d6ff0ffcf1 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -705,8 +705,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         hdev->send     = bfusb_send_frame;
         hdev->ioctl    = bfusb_ioctl;
 
-        hdev->owner = THIS_MODULE;
-
         if (hci_register_dev(hdev) < 0) {
                 BT_ERR("Can't register HCI device");
                 hci_free_dev(hdev);
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 5cb325a13745..6b1261f9deb0 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -738,8 +738,6 @@ static int bluecard_open(bluecard_info_t *info)
         hdev->send     = bluecard_hci_send_frame;
         hdev->ioctl    = bluecard_hci_ioctl;
 
-        hdev->owner = THIS_MODULE;
-
         id = inb(iobase + 0x30);
 
         if ((id & 0x0f) == 0x02)
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 29cd11d401e1..9d635148104c 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -470,8 +470,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         hdev->flush    = bpa10x_flush;
         hdev->send     = bpa10x_send_frame;
 
-        hdev->owner = THIS_MODULE;
-
         set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
 
         err = hci_register_dev(hdev);
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index e74334dfc776..0e304cb4bdea 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -584,8 +584,6 @@ static int bt3c_open(bt3c_info_t *info)
         hdev->send     = bt3c_hci_send_frame;
         hdev->ioctl    = bt3c_hci_ioctl;
 
-        hdev->owner = THIS_MODULE;
-
         /* Load firmware */
         err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev);
         if (err < 0) {
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 995cf43f4bd2..66b58fd09fbe 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -550,7 +550,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv)
         hdev->flush = btmrvl_flush;
         hdev->send = btmrvl_send_frame;
         hdev->ioctl = btmrvl_ioctl;
-        hdev->owner = THIS_MODULE;
 
         btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
 
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index d38945cc9f05..2d6e4ed1637f 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -337,8 +337,6 @@ static int btsdio_probe(struct sdio_func *func,
         hdev->flush    = btsdio_flush;
         hdev->send     = btsdio_send_frame;
 
-        hdev->owner = THIS_MODULE;
-
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 84e02f1a45b9..80ad2b9b352e 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -502,8 +502,6 @@ static int btuart_open(btuart_info_t *info)
         hdev->send     = btuart_hci_send_frame;
         hdev->ioctl    = btuart_hci_ioctl;
 
-        hdev->owner = THIS_MODULE;
-
         spin_lock_irqsave(&(info->lock), flags);
 
         /* Reset UART */
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 44b5e736ddc3..a36888a9c205 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -997,8 +997,6 @@ static int btusb_probe(struct usb_interface *intf,
         hdev->send     = btusb_send_frame;
         hdev->notify   = btusb_notify;
 
-        hdev->owner = THIS_MODULE;
-
         /* Interface numbers are hardcoded in the specification */
         data->isoc = usb_ifnum_to_if(data->udev, 1);
 
diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
index da9cf6a6e8ac..b81b32e4fa12 100644
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
@@ -317,7 +317,6 @@ static int bt_ti_probe(struct platform_device *pdev)
         hdev->close = ti_st_close;
         hdev->flush = NULL;
         hdev->send = ti_st_send_frame;
-        hdev->owner = THIS_MODULE;
 
         err = hci_register_dev(hdev);
         if (err < 0) {
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index aae40caaa188..295cf1b4a052 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -484,8 +484,6 @@ static int dtl1_open(dtl1_info_t *info)
         hdev->send     = dtl1_hci_send_frame;
         hdev->ioctl    = dtl1_hci_ioctl;
 
-        hdev->owner = THIS_MODULE;
-
         spin_lock_irqsave(&(info->lock), flags);
 
         /* Reset UART */
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 5ea49df3462b..459ff0ba5a42 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -392,8 +392,6 @@ static int hci_uart_register_dev(struct hci_uart *hu)
         hdev->send  = hci_uart_send_frame;
         hdev->parent = hu->tty->dev;
 
-        hdev->owner = THIS_MODULE;
-
         if (!reset)
                 set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
 
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 44a801292d62..5f305c131a0d 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -244,8 +244,6 @@ static int vhci_open(struct inode *inode, struct file *file)
         hdev->flush    = vhci_flush;
         hdev->send     = vhci_send_frame;
 
-        hdev->owner = THIS_MODULE;
-
         if (hci_register_dev(hdev) < 0) {
                 BT_ERR("Can't register HCI device");
                 kfree(data);
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 935aca8783c4..99984688ccdd 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -262,8 +262,6 @@ struct hci_dev {
 
         struct rfkill           *rfkill;
 
-        struct module           *owner;
-
         unsigned long           dev_flags;
 
         int (*open)(struct hci_dev *hdev);
@@ -601,11 +599,7 @@ static inline void __hci_dev_put(struct hci_dev *d)
  * hci_dev_put and hci_dev_hold are macros to avoid dragging all the
  * overhead of all the modular infrastructure into this header.
  */
-#define hci_dev_put(d)          \
-do {                            \
-        __hci_dev_put(d);       \
-        module_put(d->owner);   \
-} while (0)
+#define hci_dev_put(d) __hci_dev_put(d)
 
 static inline struct hci_dev *__hci_dev_hold(struct hci_dev *d)
 {
@@ -613,10 +607,7 @@ static inline struct hci_dev *__hci_dev_hold(struct hci_dev *d)
         return d;
 }
 
-#define hci_dev_hold(d)                                         \
-({                                                              \
-        try_module_get(d->owner) ? __hci_dev_hold(d) : NULL;    \
-})
+#define hci_dev_hold(d) __hci_dev_hold(d)
 
 #define hci_dev_lock(d)         mutex_lock(&d->lock)
 #define hci_dev_unlock(d)       mutex_unlock(&d->lock)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index f23e32a645c8..58392a6b48b5 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1548,8 +1548,7 @@ int hci_register_dev(struct hci_dev *hdev)
         struct list_head *head = &hci_dev_list, *p;
         int i, id, error;
 
-        BT_DBG("%p name %s bus %d owner %p", hdev, hdev->name,
-                                                hdev->bus, hdev->owner);
+        BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
 
         if (!hdev->open || !hdev->close)
                 return -EINVAL;