Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200717051134.19160-1-ajay.kathat@microchip.com

authored by

Ajay Singh and committed by
Kalle Valo
c83e2a6e 880e2149

+5 -4
+2 -4
drivers/net/wireless/microchip/wilc1000/sdio.c
··· 6 6 7 7 #include <linux/clk.h> 8 8 #include <linux/mmc/sdio_func.h> 9 + #include <linux/mmc/sdio_ids.h> 9 10 #include <linux/mmc/host.h> 10 11 #include <linux/mmc/sdio.h> 11 12 #include <linux/of_irq.h> ··· 16 15 17 16 #define SDIO_MODALIAS "wilc1000_sdio" 18 17 19 - #define SDIO_VENDOR_ID_WILC 0x0296 20 - #define SDIO_DEVICE_ID_WILC 0x5347 21 - 22 18 static const struct sdio_device_id wilc_sdio_ids[] = { 23 - { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) }, 19 + { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) }, 24 20 { }, 25 21 }; 26 22
+3
include/linux/mmc/sdio_ids.h
··· 105 105 #define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663 106 106 #define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668 107 107 108 + #define SDIO_VENDOR_ID_MICROCHIP_WILC 0x0296 109 + #define SDIO_DEVICE_ID_MICROCHIP_WILC1000 0x5347 110 + 108 111 #define SDIO_VENDOR_ID_SIANO 0x039a 109 112 #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 110 113 #define SDIO_DEVICE_ID_SIANO_NICE 0x0202