iio: adc: ad7192: Silence no spi_device_id warnings
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 21 Sep 2022 16:36:19 +0000 (16:36 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 23 Nov 2022 19:43:57 +0000 (19:43 +0000)
SPI devices use the spi_device_id for module autoloading even on
systems using device tree, after commit 5fa6863ba692 ("spi: Check
we have a spi_device_id for each DT compatible"), kernel warns as
follows since the spi_device_id is missing:

SPI driver ad7192 has no spi_device_id for adi,ad7190
SPI driver ad7192 has no spi_device_id for adi,ad7193
SPI driver ad7192 has no spi_device_id for adi,ad7195

Add spi_device_id entries to silence the warnings, and ensure driver
module autoloading works.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20220921163620.805879-5-weiyongjun@huaweicloud.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7192.c

index d71977be7d228c9b38c84b0385437ce1111c7a27..f5067173deb6299b7be2674c730ee95cc79c089b 100644 (file)
@@ -1037,6 +1037,8 @@ static int ad7192_probe(struct spi_device *spi)
        st->int_vref_mv = ret / 1000;
 
        st->chip_info = of_device_get_match_data(&spi->dev);
+       if (!st->chip_info)
+               st->chip_info = (void *)spi_get_device_id(spi)->driver_data;
        indio_dev->name = st->chip_info->name;
        indio_dev->modes = INDIO_DIRECT_MODE;
 
@@ -1098,12 +1100,22 @@ static const struct of_device_id ad7192_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ad7192_of_match);
 
+static const struct spi_device_id ad7192_ids[] = {
+       { "ad7190", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7190] },
+       { "ad7192", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7192] },
+       { "ad7193", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7193] },
+       { "ad7195", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7195] },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, ad7192_ids);
+
 static struct spi_driver ad7192_driver = {
        .driver = {
                .name   = "ad7192",
                .of_match_table = ad7192_of_match,
        },
        .probe          = ad7192_probe,
+       .id_table       = ad7192_ids,
 };
 module_spi_driver(ad7192_driver);