History

wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

Moved macros used for Vendor/Device ID from wilc1000 driver to common header file and changed macro name for consistency with other macros.

Ajay Singh committed 6 years ago

Commit c83e2a61 parent 880e2142 files · +5 −4Browse files

Unified · Split

2 files
  1. drivers/net/wireless/microchip/wilc1000/sdio.c +2 −4
  2. include/linux/mmc/sdio_ids.h +3 −0
drivers/net/wireless/microchip/wilc1000/sdio.c+2−4
@@ -6,6 +6,7 @@ · 5 unmodified lines
66
77 #include <linux/clk.h>
88 #include <linux/mmc/sdio_func.h>
9+#include <linux/mmc/sdio_ids.h>
910 #include <linux/mmc/host.h>
1011 #include <linux/mmc/sdio.h>
1112 #include <linux/of_irq.h>
@@ -15,11 +16,8 @@ · 3 unmodified lines
1516
1617 #define SDIO_MODALIAS "wilc1000_sdio"
1718
18−#define SDIO_VENDOR_ID_WILC 0x0296
19−#define SDIO_DEVICE_ID_WILC 0x5347
20−
2119 static const struct sdio_device_id wilc_sdio_ids[] = {
22− { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
20+ { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
2321 { },
2422 };
2523
include/linux/mmc/sdio_ids.h+3−0
@@ -105,6 +105,9 @@ · 104 unmodified lines
105105 #define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663
106106 #define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668
107107
108+#define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296
109+#define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347
110+
108111 #define SDIO_VENDOR_ID_SIANO 0x039a
109112 #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201
110113 #define SDIO_DEVICE_ID_SIANO_NICE 0x0202