[PATCH] mmc: spi: Add device-tree SPI IDs

[PATCH] mmc: spi: Add device-tree SPI IDs

[Jon Hunter]

Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT
compatible") added a test to check that every SPI driver has a
spi_device_id for each DT compatiable string defined by the driver
and warns if the spi_device_id is missing. The spi_device_id is
missing for the MMC SPI driver and the following warning is now seen.

 WARNING KERN SPI driver mmc_spi has no spi_device_id for mmc-spi-slot

Fix this by adding the necessary spi_device_id.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/mmc/host/mmc_spi.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index f4c8e1a61f53..b431cdd27353 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1514,6 +1514,12 @@ static int mmc_spi_remove(struct spi_device *spi)
 	return 0;
 }
 
+static const struct spi_device_id mmc_spi_dev_ids[] = {
+	{ "mmc-spi-slot"},
+	{ },
+};
+MODULE_DEVICE_TABLE(spi, mmc_spi_dev_ids);
+
 static const struct of_device_id mmc_spi_of_match_table[] = {
 	{ .compatible = "mmc-spi-slot", },
 	{},
@@ -1525,6 +1531,7 @@ static struct spi_driver mmc_spi_driver = {
 		.name =		"mmc_spi",
 		.of_match_table = mmc_spi_of_match_table,
 	},
+	.id_table =	mmc_spi_dev_ids,
 	.probe =	mmc_spi_probe,
 	.remove =	mmc_spi_remove,
 };
-- 
2.25.1

Re: [PATCH] mmc: spi: Add device-tree SPI IDs

[Ulf Hansson]

On Mon, 15 Nov 2021 at 12:38, Jon Hunter <jonathanh@nvidia.com> wrote:
>
> Commit 5fa6863ba692 ("spi: Check we have a spi_device_id for each DT
> compatible") added a test to check that every SPI driver has a
> spi_device_id for each DT compatiable string defined by the driver
> and warns if the spi_device_id is missing. The spi_device_id is
> missing for the MMC SPI driver and the following warning is now seen.
>
>  WARNING KERN SPI driver mmc_spi has no spi_device_id for mmc-spi-slot
>
> Fix this by adding the necessary spi_device_id.
>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>

Applied for fixes, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/mmc_spi.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
> index f4c8e1a61f53..b431cdd27353 100644
> --- a/drivers/mmc/host/mmc_spi.c
> +++ b/drivers/mmc/host/mmc_spi.c
> @@ -1514,6 +1514,12 @@ static int mmc_spi_remove(struct spi_device *spi)
>         return 0;
>  }
>
> +static const struct spi_device_id mmc_spi_dev_ids[] = {
> +       { "mmc-spi-slot"},
> +       { },
> +};
> +MODULE_DEVICE_TABLE(spi, mmc_spi_dev_ids);
> +
>  static const struct of_device_id mmc_spi_of_match_table[] = {
>         { .compatible = "mmc-spi-slot", },
>         {},
> @@ -1525,6 +1531,7 @@ static struct spi_driver mmc_spi_driver = {
>                 .name =         "mmc_spi",
>                 .of_match_table = mmc_spi_of_match_table,
>         },
> +       .id_table =     mmc_spi_dev_ids,
>         .probe =        mmc_spi_probe,
>         .remove =       mmc_spi_remove,
>  };
> --
> 2.25.1
>