summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-10 12:05:52 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 14:25:34 -0700
commit60dee5ccd789ee8a380eee802b6cb24c52123428 (patch)
treeb9d5bf8e60dec26d557bd94611e14c2f577e4108
parent9666fb356da78a5ec28403197d72e8cd6aa16424 (diff)
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>
-rw-r--r--drivers/bluetooth/btmrvl_drv.h2
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 5da3be407703..411c7a77082d 100644
--- 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 0dea23e99ec1..7638f62e8a06 100644
--- 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");