History

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

Define appropriate macro names for consistency with other macros.

Pali Rohár committed 6 years ago

Commit 8baa6d11 parent 4dc28c92 files · +6 −2Browse files

Unified · Split

2 files
  1. drivers/net/wireless/broadcom/b43/sdio.c +2 −2
  2. include/linux/mmc/sdio_ids.h +4 −0
drivers/net/wireless/broadcom/b43/sdio.c+2−2
@@ -180,8 +180,8 @@ static void b43_sdio_remove(struct sdio_func *func) · 179 unmodified lines
180180 }
181181
182182 static const struct sdio_device_id b43_sdio_ids[] = {
183− { SDIO_DEVICE(0x02d0, 0x044b) }, /* Nintendo Wii WLAN daughter card */
184− { SDIO_DEVICE(0x0092, 0x0004) }, /* C-guys, Inc. EW-CG1102GC */
183+ { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII) },
184+ { SDIO_DEVICE(SDIO_VENDOR_ID_CGUYS, SDIO_DEVICE_ID_CGUYS_EW_CG1102GC) },
185185 { },
186186 };
187187
include/linux/mmc/sdio_ids.h+4−0
@@ -25,6 +25,9 @@ · 24 unmodified lines
2525 * Vendors and devices. Sort key: vendor first, device next.
2626 */
2727
28+#define SDIO_VENDOR_ID_CGUYS 0x0092
29+#define SDIO_DEVICE_ID_CGUYS_EW_CG1102GC 0x0004
30+
2831 #define SDIO_VENDOR_ID_ATHEROS 0x0271
2932 #define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300
3033 #define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301
@@ -37,6 +40,7 @@ · 6 unmodified lines
3740 #define SDIO_DEVICE_ID_ATHEROS_QCA9377 0x0701
3841
3942 #define SDIO_VENDOR_ID_BROADCOM 0x02d0
43+#define SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII 0x044b
4044 #define SDIO_DEVICE_ID_BROADCOM_43143 0xa887
4145 #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324
4246 #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t