Skip to content

Commit 11e2521

Browse files
Tomas Winklerdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ed04642 commit 11e2521

File tree

1 file changed

+3
-11
lines changed
  • drivers/misc/iwmc3200top

1 file changed

+3
-11
lines changed

drivers/misc/iwmc3200top/main.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@ MODULE_VERSION(DRIVER_VERSION);
6262
MODULE_LICENSE("GPL");
6363
MODULE_AUTHOR(DRIVER_COPYRIGHT);
6464

65-
66-
/* FIXME: These can be found in sdio_ids.h in newer kernels */
67-
#ifndef SDIO_INTEL_VENDOR_ID
68-
#define SDIO_INTEL_VENDOR_ID 0x0089
69-
#endif
70-
#ifndef SDIO_DEVICE_ID_INTEL_IWMC3200TOP
71-
#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
72-
#endif
73-
7465
/*
7566
* This workers main task is to wait for OP_OPR_ALIVE
7667
* from TOP FW until ALIVE_MSG_TIMOUT timeout is elapsed.
@@ -662,8 +653,9 @@ static void iwmct_remove(struct sdio_func *func)
662653

663654

664655
static const struct sdio_device_id iwmct_ids[] = {
665-
{ SDIO_DEVICE(SDIO_INTEL_VENDOR_ID, SDIO_DEVICE_ID_INTEL_IWMC3200TOP)},
666-
{ /* end: all zeroes */ },
656+
/* Intel Wireless MultiCom 3200 Top Driver */
657+
{ SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 0x1404)},
658+
{ }, /* Terminating entry */
667659
};
668660

669661
MODULE_DEVICE_TABLE(sdio, iwmct_ids);

0 commit comments

Comments
 (0)