Bluetooth: Remove private device name of Marvell SDIO driver

For some reason the btmrvl_device struct has a name field that the SDIO
fills in, but then never ever uses again. That is totally pointless and
so just remove it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 5da3be4077036b5109bf1ee46be2248138149aef..411c7a77082dc7881acf526d0c8c7f5265e231bd 100644 (file)
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -24,7 +24,6 @@
 #include <net/bluetooth/bluetooth.h>
 
 #define BTM_HEADER_LEN                 4
-#define BTM_DEV_NAME_LEN               32
 #define BTM_UPLD_SIZE                  2312
 
 /* Time to wait until Host Sleep state change in millisecond */
@@ -39,7 +38,6 @@ struct btmrvl_thread {
 };
 
 struct btmrvl_device {
-       char name[BTM_DEV_NAME_LEN];
        void *card;
        struct hci_dev *hcidev;
 

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0dea23e99ec1fcb1a883d21b36b12b0555d331e8..7638f62e8a060bb2455fa12a176a1aa185bf64ed 100644 (file)
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -1020,9 +1020,6 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
        priv->hw_host_to_card = btmrvl_sdio_host_to_card;
        priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
 
-       strncpy(priv->btmrvl_dev.name, "btmrvl_sdio0",
-                       sizeof(priv->btmrvl_dev.name));
-
        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
 
        BT_DBG("Leave");