aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2009-11-14 08:36:35 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-15 22:08:31 -0800
commit11e2521701681452f54f0e98ee2041da07d24c70 (patch)
tree96fec6999e8c240e6ff0e83b4374b85bb3815137
parented04642f753b1240fc65c2978b7365e93209972a (diff)
iwmc3200top: use prefered style for the device table.
Use device id number directly accompany with comment rather then a #define Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/misc/iwmc3200top/main.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index 6e4e49113ab..a1ce97ef0be 100644
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -62,15 +62,6 @@ MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL");
MODULE_AUTHOR(DRIVER_COPYRIGHT);
-
-/* FIXME: These can be found in sdio_ids.h in newer kernels */
-#ifndef SDIO_INTEL_VENDOR_ID
-#define SDIO_INTEL_VENDOR_ID 0x0089
-#endif
-#ifndef SDIO_DEVICE_ID_INTEL_IWMC3200TOP
-#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
-#endif
-
/*
* This workers main task is to wait for OP_OPR_ALIVE
* from TOP FW until ALIVE_MSG_TIMOUT timeout is elapsed.
@@ -662,8 +653,9 @@ static void iwmct_remove(struct sdio_func *func)
static const struct sdio_device_id iwmct_ids[] = {
- { SDIO_DEVICE(SDIO_INTEL_VENDOR_ID, SDIO_DEVICE_ID_INTEL_IWMC3200TOP)},
- { /* end: all zeroes */ },
+ /* Intel Wireless MultiCom 3200 Top Driver */
+ { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 0x1404)},
+ { }, /* Terminating entry */
};
MODULE_DEVICE_TABLE(sdio, iwmct_ids);