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

Define appropriate macro names for consistency with other macros.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20200522144412.19712-6-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com>

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 519788c442ca3b7138839f5e4c10105c2f449f82..bff095be2f97114c9d540b153b54b018314da1ba 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -51,9 +51,9 @@ static const struct btmtksdio_data mt7668_data = {
 };
 
 static const struct sdio_device_id btmtksdio_table[] = {
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7663),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7663),
         .driver_data = (kernel_ulong_t)&mt7663_data },
-       {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7668),
+       {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7668),
         .driver_data = (kernel_ulong_t)&mt7668_data },
        { }     /* Terminating entry */
 };

diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 1237e1048d06fe188081fc5c8a295cb7ac1e2469..c9aca57d4dea381d29fc44b3706b5a68408d71d3 100644 (file)
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -80,6 +80,8 @@
 #define SDIO_DEVICE_ID_MARVELL_8987_BT         0x914a
 
 #define SDIO_VENDOR_ID_MEDIATEK                        0x037a
+#define SDIO_DEVICE_ID_MEDIATEK_MT7663         0x7663
+#define SDIO_DEVICE_ID_MEDIATEK_MT7668         0x7668
 
 #define SDIO_VENDOR_ID_SIANO                   0x039a
 #define SDIO_DEVICE_ID_SIANO_NOVA_B0           0x0201