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
180}180}
181 181
182static const struct sdio_device_id b43_sdio_ids[] = {182static const struct sdio_device_id b43_sdio_ids[] = {
183 { SDIO_DEVICE(0x02d0, 0x044b) }, /* Nintendo Wii WLAN daughter card */183 { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII) },
184 { SDIO_DEVICE(0x0092, 0x0004) }, /* C-guys, Inc. EW-CG1102GC */184 { SDIO_DEVICE(SDIO_VENDOR_ID_CGUYS, SDIO_DEVICE_ID_CGUYS_EW_CG1102GC) },
185 { },185 { },
186};186};
187 187
include/linux/mmc/sdio_ids.h+4−0
@@ -25,6 +25,9 @@ · 24 unmodified lines
25 * Vendors and devices. Sort key: vendor first, device next.25 * Vendors and devices. Sort key: vendor first, device next.
26 */26 */
27 27
28#define SDIO_VENDOR_ID_CGUYS 0x0092
29#define SDIO_DEVICE_ID_CGUYS_EW_CG1102GC 0x0004
30
28#define SDIO_VENDOR_ID_ATHEROS 0x027131#define SDIO_VENDOR_ID_ATHEROS 0x0271
29#define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x030032#define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300
30#define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x030133#define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301
@@ -37,6 +40,7 @@ · 6 unmodified lines
37#define SDIO_DEVICE_ID_ATHEROS_QCA9377 0x070140#define SDIO_DEVICE_ID_ATHEROS_QCA9377 0x0701
38 41
39#define SDIO_VENDOR_ID_BROADCOM 0x02d042#define SDIO_VENDOR_ID_BROADCOM 0x02d0
43#define SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII 0x044b
40#define SDIO_DEVICE_ID_BROADCOM_43143 0xa88744#define SDIO_DEVICE_ID_BROADCOM_43143 0xa887
41#define SDIO_DEVICE_ID_BROADCOM_43241 0x432445#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324
42#define SDIO_DEVICE_ID_BROADCOM_4329 0x432946#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