From 60dee5ccd789ee8a380eee802b6cb24c52123428 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 10 Jun 2009 12:05:52 +0200 Subject: [PATCH] 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 --- drivers/bluetooth/btmrvl_drv.h | 2 -- drivers/bluetooth/btmrvl_sdio.c | 3 --- 2 files changed, 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 #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");