rsi: remove redundant device ids

Removing redundant device id's from both usb and sdio idtables, as rsi
driver currently supporting only one module(RS9113). Also, replaced ids
with specific defines.

Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 416981d9922921e87a64b6325c167dab91eab875..5733e440ecafff23599bc5e561ca200e9887ee0a 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -1394,10 +1394,7 @@ static const struct dev_pm_ops rsi_pm_ops = {
 #endif
 
 static const struct sdio_device_id rsi_dev_table[] =  {
-       { SDIO_DEVICE(0x303, 0x100) },
-       { SDIO_DEVICE(0x041B, 0x0301) },
-       { SDIO_DEVICE(0x041B, 0x0201) },
-       { SDIO_DEVICE(0x041B, 0x9330) },
+       { SDIO_DEVICE(RSI_SDIO_VID_9113, RSI_SDIO_PID_9113) },
        { /* Blank */},
 };
 

diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 6ce6b754df12c120d057d4d3c2374f4397893027..c0a163e404029ce6f3cbb10100d2cf02ba7c0492 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -835,11 +835,7 @@ static int rsi_resume(struct usb_interface *intf)
 #endif
 
 static const struct usb_device_id rsi_dev_table[] = {
-       { USB_DEVICE(0x0303, 0x0100) },
-       { USB_DEVICE(0x041B, 0x0301) },
-       { USB_DEVICE(0x041B, 0x0201) },
-       { USB_DEVICE(0x041B, 0x9330) },
-       { USB_DEVICE(0x1618, 0x9113) },
+       { USB_DEVICE(RSI_USB_VID_9113, RSI_USB_PID_9113) },
        { /* Blank */},
 };
 

diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h
index 353dbdf31e758208aeeffa918980de8ef0abb439..66dcd2ec90515b96ac04c2d7fb9c5f7e4044333a 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_sdio.h
+++ b/drivers/net/wireless/rsi/rsi_sdio.h
@@ -28,6 +28,9 @@
 #include <linux/mmc/sdio_ids.h>
 #include "rsi_main.h"
 
+#define RSI_SDIO_VID_9113    0x041B
+#define RSI_SDIO_PID_9113    0x9330
+
 enum sdio_interrupt_type {
        BUFFER_FULL         = 0x0,
        BUFFER_AVAILABLE    = 0x2,

diff --git a/drivers/net/wireless/rsi/rsi_usb.h b/drivers/net/wireless/rsi/rsi_usb.h
index b6fe79f0a513938a2a4757318dc1eaa2dcd28fe0..5b2eddd1a2ee5f7cc372ad1a16a027d3923b8d5b 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_usb.h
+++ b/drivers/net/wireless/rsi/rsi_usb.h
@@ -22,6 +22,9 @@
 #include "rsi_main.h"
 #include "rsi_common.h"
 
+#define RSI_USB_VID_9113       0x1618
+#define RSI_USB_PID_9113       0x9113
+
 #define USB_INTERNAL_REG_1           0x25000
 #define RSI_USB_READY_MAGIC_NUM      0xab
 #define FW_STATUS_REG                0x41050012