Skip to contentSkip to conversation

cw1200: Remove local sdio VENDOR and DEVICE id definitions

PATCH In review Pali Rohár 2 participants 2 messages May 20, 2020 – May 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cw1200: Remove local sdio VENDOR and DEVICE id definitions

They are already present in linux/mmc/sdio_ids.h.

---
 drivers/net/wireless/st/cw1200/cw1200_sdio.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/st/cw1200/cw1200_sdio.c +1 -8
index 43e012073dbf..b65ec14136c7 100644
@@ -14,6 +14,7 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio.h>
+#include <linux/mmc/sdio_ids.h>
 #include <net/mac80211.h>
 
 #include "cw1200.h"
@@ -48,14 +49,6 @@ struct hwbus_priv {
 	const struct cw1200_platform_data_sdio *pdata;
 };
 
-#ifndef SDIO_VENDOR_ID_STE
-#define SDIO_VENDOR_ID_STE		0x0020
-#endif
-
-#ifndef SDIO_DEVICE_ID_STE_CW1200
-#define SDIO_DEVICE_ID_STE_CW1200	0x2280
-#endif
-
 static const struct sdio_device_id cw1200_sdio_ids[] = {
 	{ SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_CW1200) },
 	{ /* end: all zeroes */			},
Signature · 1 line
2.20.1
#1 lore raw
Quoted 3 lines · Pali Rohár

They are already present in linux/mmc/sdio_ids.h.

Patch applied to wireless-drivers-next.git, thanks.

83cee4e625f8 cw1200: Remove local sdio VENDOR and DEVICE id definitions

Signature · 3 lines
https://patchwork.kernel.org/patch/11560329/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches