iio: adc: ti-ads131e08: Silence no spi_device_id warnings
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 21 Sep 2022 16:36:16 +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 ads131e08 has no spi_device_id for ti,ads131e04
SPI driver ads131e08 has no spi_device_id for ti,ads131e06

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-2-weiyongjun@huaweicloud.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ti-ads131e08.c

index 5235a93f28bc67c6eec258f518987dbc8be5623c..fcfc4625431332263273fb9a8395fafcd05b301a 100644 (file)
@@ -807,6 +807,8 @@ static int ads131e08_probe(struct spi_device *spi)
        int ret;
 
        info = device_get_match_data(&spi->dev);
+       if (!info)
+               info = (void *)spi_get_device_id(spi)->driver_data;
        if (!info) {
                dev_err(&spi->dev, "failed to get match data\n");
                return -ENODEV;
@@ -926,12 +928,21 @@ static const struct of_device_id ads131e08_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ads131e08_of_match);
 
+static const struct spi_device_id ads131e08_ids[] = {
+       { "ads131e04", (kernel_ulong_t)&ads131e08_info_tbl[ads131e04] },
+       { "ads131e06", (kernel_ulong_t)&ads131e08_info_tbl[ads131e06] },
+       { "ads131e08", (kernel_ulong_t)&ads131e08_info_tbl[ads131e08] },
+       {}
+};
+MODULE_DEVICE_TABLE(spi, ads131e08_ids);
+
 static struct spi_driver ads131e08_driver = {
        .driver = {
                .name = "ads131e08",
                .of_match_table = ads131e08_of_match,
        },
        .probe = ads131e08_probe,
+       .id_table = ads131e08_ids,
 };
 module_spi_driver(ads131e08_driver);