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 <pali@kernel.org>
Link: https://lore.kernel.org/r/20200522144412.19712-3-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com>

diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index acf61b93b7825ad645f1bd8b6e8daaf1fdcb8fba..44fbd0acb87a8922309b99ef5daaa6c4c9833e07 100644 (file)
--- 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 96f43e0dc78f201752c6c84ab1536c4fd7f60385..7e992a0e6cc086c5d6bab2d815261f14ee5cc8e1 100644 (file)
--- 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