On 22/05/2020 16:44, Pali Rohár wrote:
> Define appropriate macro names for consistency with other macros.
>
> Signed-off-by: Pali Rohár <p...@kernel.org>
Reviewed-by: Matthias Brugger <matthias....@gmail.com>
> ---
> drivers/bluetooth/btmtksdio.c | 4 ++--
> include/linux/mmc/sdio_ids.h | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
> index 519788c442ca..bff095be2f97 100644
> --- 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 1237e1048d06..c9aca57d4dea 100644
> --- 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
>
