diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-06-10 06:05:52 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-08-22 17:25:34 -0400 |
commit | 60dee5ccd789ee8a380eee802b6cb24c52123428 (patch) | |
tree | b9d5bf8e60dec26d557bd94611e14c2f577e4108 /drivers/bluetooth | |
parent | 9666fb356da78a5ec28403197d72e8cd6aa16424 (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>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/btmrvl_drv.h | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 3 |
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 @@ | |||
24 | #include <net/bluetooth/bluetooth.h> | 24 | #include <net/bluetooth/bluetooth.h> |
25 | 25 | ||
26 | #define BTM_HEADER_LEN 4 | 26 | #define BTM_HEADER_LEN 4 |
27 | #define BTM_DEV_NAME_LEN 32 | ||
28 | #define BTM_UPLD_SIZE 2312 | 27 | #define BTM_UPLD_SIZE 2312 |
29 | 28 | ||
30 | /* Time to wait until Host Sleep state change in millisecond */ | 29 | /* Time to wait until Host Sleep state change in millisecond */ |
@@ -39,7 +38,6 @@ struct btmrvl_thread { | |||
39 | }; | 38 | }; |
40 | 39 | ||
41 | struct btmrvl_device { | 40 | struct btmrvl_device { |
42 | char name[BTM_DEV_NAME_LEN]; | ||
43 | void *card; | 41 | void *card; |
44 | struct hci_dev *hcidev; | 42 | struct hci_dev *hcidev; |
45 | 43 | ||
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, | |||
1020 | priv->hw_host_to_card = btmrvl_sdio_host_to_card; | 1020 | priv->hw_host_to_card = btmrvl_sdio_host_to_card; |
1021 | priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw; | 1021 | priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw; |
1022 | 1022 | ||
1023 | strncpy(priv->btmrvl_dev.name, "btmrvl_sdio0", | ||
1024 | sizeof(priv->btmrvl_dev.name)); | ||
1025 | |||
1026 | btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); | 1023 | btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); |
1027 | 1024 | ||
1028 | BT_DBG("Leave"); | 1025 | BT_DBG("Leave"); |