Skip to content

Commit 2849bee

Browse files
palistorulf
authored andcommitted
mmc: sdio: Change macro names for Marvell 8688 modules
Add underscore as separator in Marvell 8688 macro names for better readability and consistency. Signed-off-by: Pali Rohár <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Ganapathi Bhat <[email protected]>
1 parent 4bc90f4 commit 2849bee

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/net/wireless/marvell/libertas/if_sdio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static const struct sdio_device_id if_sdio_ids[] = {
6565
{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
6666
SDIO_DEVICE_ID_MARVELL_LIBERTAS) },
6767
{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
68-
SDIO_DEVICE_ID_MARVELL_8688WLAN) },
68+
SDIO_DEVICE_ID_MARVELL_8688_WLAN) },
6969
{ /* end: all zeroes */ },
7070
};
7171

include/linux/mmc/sdio_ids.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
#define SDIO_VENDOR_ID_MARVELL 0x02df
5858
#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
59-
#define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104
60-
#define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105
59+
#define SDIO_DEVICE_ID_MARVELL_8688_WLAN 0x9104
60+
#define SDIO_DEVICE_ID_MARVELL_8688_BT 0x9105
6161
#define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128
6262
#define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134
6363

0 commit comments

Comments
 (0)