[PATCH v2 11/11] net: wireless: ti: remove local VENDOR_ID and DEVICE_ID definitions
From: H. Nikolaus Schaller <hidden>
Date: 2019-10-19 18:42:00
Also in:
linux-arm-kernel, linux-devicetree, linux-mmc, linux-omap, linux-wireless, lkml, stable
Subsystem:
the rest, ti wilink wireless drivers · Maintainer:
Linus Torvalds
They are already included from mmc/sdio_ids.h and do not need
a local definition.
Fixes: 884f38607897 ("mmc: core: move some sdio IDs out of quirks file")
Signed-off-by: H. Nikolaus Schaller <redacted>
Acked-by: Kalle Valo <redacted>
Cc: <redacted> # 4.11.0
---
drivers/net/wireless/ti/wl1251/sdio.c | 8 --------
drivers/net/wireless/ti/wlcore/sdio.c | 8 --------
2 files changed, 16 deletions(-)
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 42b55f3a50df..3c4d5e38c66c 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c@@ -22,14 +22,6 @@ #include "wl1251.h" -#ifndef SDIO_VENDOR_ID_TI -#define SDIO_VENDOR_ID_TI 0x104c -#endif - -#ifndef SDIO_DEVICE_ID_TI_WL1251 -#define SDIO_DEVICE_ID_TI_WL1251 0x9066 -#endif - struct wl1251_sdio { struct sdio_func *func; u32 elp_val;
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 7afaf35f2453..9fd8cf2d270c 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c@@ -26,14 +26,6 @@ #include "wl12xx_80211.h" #include "io.h" -#ifndef SDIO_VENDOR_ID_TI -#define SDIO_VENDOR_ID_TI 0x0097 -#endif - -#ifndef SDIO_DEVICE_ID_TI_WL1271 -#define SDIO_DEVICE_ID_TI_WL1271 0x4076 -#endif - static bool dump = false; struct wl12xx_sdio_glue {
--
2.19.1