| Message ID | 20200520125410.31757-1-pali@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 83cee4e625f8344a55b197e2bf9713088e571375 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | cw1200: Remove local sdio VENDOR and DEVICE id definitions | expand |
Pali Rohár <pali@kernel.org> wrote: > They are already present in linux/mmc/sdio_ids.h. > > Signed-off-by: Pali Rohár <pali@kernel.org> Patch applied to wireless-drivers-next.git, thanks. 83cee4e625f8 cw1200: Remove local sdio VENDOR and DEVICE id definitions
diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c index 43e012073dbf..b65ec14136c7 100644 --- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c +++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c @@ -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 */ },
They are already present in linux/mmc/sdio_ids.h. Signed-off-by: Pali Rohár <pali@kernel.org> --- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)