[PATCH 2/2] mmc: sdio: Move SDIO IDs from rtl8723bs, driver to common include file

Brian O'Keefe
2020-11-25T18:26:08Z

Macro names were derived from the Windows driver, as that was the best
available source.

Signed-off-by: Brian O'Keefe <bokeefe@alum.wpi.edu>
---
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index b2208e5f190a..8dd3763d1a33 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -10,18 +10,19 @@
#include <rtw_debug.h>
#include <hal_btcoex.h>
#include <linux/jiffies.h>
+#include <linux/mmc/sdio_ids.h>

#ifndef dev_to_sdio_func
#define dev_to_sdio_func(d) container_of(d, struct sdio_func, dev)
#endif

static const struct sdio_device_id sdio_ids[] = {
- { SDIO_DEVICE(0x024c, 0x0523), },
- { SDIO_DEVICE(0x024c, 0x0525), },
- { SDIO_DEVICE(0x024c, 0x0623), },
- { SDIO_DEVICE(0x024c, 0x0626), },
- { SDIO_DEVICE(0x024c, 0x0627), },
- { SDIO_DEVICE(0x024c, 0xb723), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_HP), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_TCL), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_ACER), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK, SDIO_DEVICE_ID_REALTEK_BRASWELL), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
SDIO_DEVICE_ID_REALTEK_ACER_PWR_LIMIT), },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
SDIO_DEVICE_ID_REALTEK_COMMON_02), },
{ /* end: all zeroes */ },
};
MODULE_DEVICE_TABLE(sdio, sdio_ids);
--
2.25.1