imwc3200: move iwmc3200 SDIO ids to sdio_ids.h

1. add intel's sdio vendor id to sdio_ids.h
2. move iwmc3200 sdio devices' ids to sdio_ids.h

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index 2538825d1c662580d8211937937e6ec6084cfd1d..ea7b29034aab9fd308a46129f87ca65d9596b934 100644 (file)
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -58,6 +58,7 @@
  */
 
 #include <linux/debugfs.h>
+#include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 #include "i2400m-sdio.h"
@@ -501,15 +502,12 @@ void i2400ms_remove(struct sdio_func *func)
        d_fnend(3, dev, "SDIO func %p\n", func);
 }
 
-enum {
-       I2400MS_INTEL_VID = 0x89,
-};
-
 static
 const struct sdio_device_id i2400ms_sdio_ids[] = {
-       /* Intel: i2400m WiMAX over SDIO */
-       { SDIO_DEVICE(I2400MS_INTEL_VID, 0x1402) },
-       { },                    /* end: all zeroes */
+       /* Intel: i2400m WiMAX (iwmc3200) over SDIO */
+       { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
+                     SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },
+       { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);
 

diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index b93f620ee4f17efa1432c7438bf0f19d52c792be..8b1de84003ca376490e376192396c50b3069b08b 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -65,6 +65,7 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
+#include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 
@@ -492,7 +493,8 @@ static void iwm_sdio_remove(struct sdio_func *func)
 }
 
 static const struct sdio_device_id iwm_sdio_ids[] = {
-       { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, SDIO_DEVICE_ID_IWM) },
+       { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
+                     SDIO_DEVICE_ID_INTEL_IWMC3200WIFI) },
        { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, iwm_sdio_ids);

diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.h b/drivers/net/wireless/iwmc3200wifi/sdio.h
index b3c156b08dda9f9c23dfb8052564ee7c8d69c0e7..aab6b6892e45bc9f737aa00299b00f9249c799a3 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/sdio.h
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.h
@@ -39,9 +39,6 @@
 #ifndef __IWM_SDIO_H__
 #define __IWM_SDIO_H__
 
-#define SDIO_VENDOR_ID_INTEL 0x89
-#define SDIO_DEVICE_ID_IWM   0x1403
-
 #define IWM_SDIO_DATA_ADDR           0x0
 #define IWM_SDIO_INTR_ENABLE_ADDR    0x14
 #define IWM_SDIO_INTR_STATUS_ADDR    0x13

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 39751c8cde9cb010773a43c23a926bc9001b2de7..2dbfb5a05994d2118b0b2ab25be5133964cbc78c 100644 (file)
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -22,6 +22,12 @@
 /*
  * Vendors and devices.  Sort key: vendor first, device next.
  */
+#define SDIO_VENDOR_ID_INTEL                   0x0089
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX     0x1402
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI      0x1403
+#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP       0x1404
+#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS       0x1405
+#define SDIO_DEVICE_ID_INTEL_IWMC3200BT                0x1406
 
 #define SDIO_VENDOR_ID_MARVELL                 0x02df
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS                0x9103