History

mmc: sdio: Move SDIO IDs from rsi_sdio driver to common include file

Define appropriate macro names for consistency with other macros.

Pali Rohár committed 6 years ago

Commit 4f7872a1 parent 92a21733 files · +8 −8Browse files

Unified · Split

3 files
  1. drivers/net/wireless/rsi/rsi_91x_sdio.c +4 −4
  2. drivers/net/wireless/rsi/rsi_sdio.h +0 −4
  3. include/linux/mmc/sdio_ids.h +4 −0
drivers/net/wireless/rsi/rsi_91x_sdio.c+4−4
@@ -1038,10 +1038,10 @@ static int rsi_probe(struct sdio_func *pfunction, · 1037 unmodified lines
10381038 goto fail_free_adapter;
10391039 }
10401040
1041− if (pfunction->device == RSI_SDIO_PID_9113) {
1041+ if (pfunction->device == SDIO_DEVICE_ID_RSI_9113) {
10421042 rsi_dbg(ERR_ZONE, "%s: 9113 module detected\n", __func__);
10431043 adapter->device_model = RSI_DEV_9113;
1044− } else if (pfunction->device == RSI_SDIO_PID_9116) {
1044+ } else if (pfunction->device == SDIO_DEVICE_ID_RSI_9116) {
10451045 rsi_dbg(ERR_ZONE, "%s: 9116 module detected\n", __func__);
10461046 adapter->device_model = RSI_DEV_9116;
10471047 } else {
@@ -1526,8 +1526,8 @@ static const struct dev_pm_ops rsi_pm_ops = { · 478 unmodified lines
15261526 #endif
15271527
15281528 static const struct sdio_device_id rsi_dev_table[] = {
1529− { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9113) },
1530− { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9116) },
1529+ { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9113) },
1530+ { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9116) },
15311531 { /* Blank */},
15321532 };
15331533
drivers/net/wireless/rsi/rsi_sdio.h+0−4
@@ -28,10 +28,6 @@ · 27 unmodified lines
2828 #include <linux/mmc/sdio_ids.h>
2929 #include "rsi_main.h"
3030
31−#define RSI_SDIO_VENDOR_ID 0x041B
32−#define RSI_SDIO_PID_9113 0x9330
33−#define RSI_SDIO_PID_9116 0x9116
34−
3531 enum sdio_interrupt_type {
3632 BUFFER_FULL = 0x0,
3733 BUFFER_AVAILABLE = 0x2,
include/linux/mmc/sdio_ids.h+4−0
@@ -118,6 +118,10 @@ · 117 unmodified lines
118118 #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100
119119 #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347
120120
121+#define SDIO_VENDOR_ID_RSI 0x041b
122+#define SDIO_DEVICE_ID_RSI_9113 0x9330
123+#define SDIO_DEVICE_ID_RSI_9116 0x9116
124+
121125 #define SDIO_VENDOR_ID_TI_WL1251 0x104c
122126 #define SDIO_DEVICE_ID_TI_WL1251 0x9066
123127