[PATCH 02/11] mmc: sdio: Change macro names for Marvell 8688 modules

[Pali Rohár]

Add underscore as separator in Marvell 8688 macro names for better
readability and consistency.

Signed-off-by: Pali Rohár <p...@kernel.org>
---
 drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +-
 include/linux/mmc/sdio_ids.h                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c 
b/drivers/net/wireless/marvell/libertas/if_sdio.c
index acf61b93b782..44fbd0acb87a 100644
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -65,7 +65,7 @@ static const struct sdio_device_id if_sdio_ids[] = {
        { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
                        SDIO_DEVICE_ID_MARVELL_LIBERTAS) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
-                       SDIO_DEVICE_ID_MARVELL_8688WLAN) },
+                       SDIO_DEVICE_ID_MARVELL_8688_WLAN) },
        { /* end: all zeroes */                         },
 };
 
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 96f43e0dc78f..7e992a0e6cc0 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -56,8 +56,8 @@
 
 #define SDIO_VENDOR_ID_MARVELL                 0x02df
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS                0x9103
-#define SDIO_DEVICE_ID_MARVELL_8688WLAN                0x9104
-#define SDIO_DEVICE_ID_MARVELL_8688BT          0x9105
+#define SDIO_DEVICE_ID_MARVELL_8688_WLAN       0x9104
+#define SDIO_DEVICE_ID_MARVELL_8688_BT         0x9105
 #define SDIO_DEVICE_ID_MARVELL_8797_F0         0x9128
 #define SDIO_DEVICE_ID_MARVELL_8887_F0         0x9134
 
-- 
2.20.1