| Message ID | 20220901041146.3652287-3-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,1/3] dt-bindings: iio: adc: ti,tsc2046: add vref-supply property | expand |
On Thu, Sep 1, 2022 at 7:12 AM Oleksij Rempel <o.rempel@pengutronix.de> wrote: > > Add spi_device_id to silent following kernel runtime warning: > "SPI driver tsc2046 has no spi_device_id for ti,tsc2046e-adc". Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > changes v3: > - add missing point > - remove unneeded blank line > - assignment id at the definition line > changes v2: > - attach actual driver_data > - use spi_get_device_id fallback > --- > drivers/iio/adc/ti-tsc2046.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c > index bbc8b4137b0b1..d5d799972fefd 100644 > --- a/drivers/iio/adc/ti-tsc2046.c > +++ b/drivers/iio/adc/ti-tsc2046.c > @@ -762,6 +762,11 @@ static int tsc2046_adc_probe(struct spi_device *spi) > } > > dcfg = device_get_match_data(dev); > + if (!dcfg) { > + const struct spi_device_id *id = spi_get_device_id(spi); > + > + dcfg = (const struct tsc2046_adc_dcfg *)id->driver_data; > + } > if (!dcfg) > return -EINVAL; > > @@ -878,11 +883,18 @@ static const struct of_device_id ads7950_of_table[] = { > }; > MODULE_DEVICE_TABLE(of, ads7950_of_table); > > +static const struct spi_device_id tsc2046_adc_spi_ids[] = { > + { "tsc2046e-adc", (unsigned long)&tsc2046_adc_dcfg_tsc2046e }, > + { } > +}; > +MODULE_DEVICE_TABLE(spi, tsc2046_adc_spi_ids); > + > static struct spi_driver tsc2046_adc_driver = { > .driver = { > .name = "tsc2046", > .of_match_table = ads7950_of_table, > }, > + .id_table = tsc2046_adc_spi_ids, > .probe = tsc2046_adc_probe, > .remove = tsc2046_adc_remove, > }; > -- > 2.30.2 >
diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c index bbc8b4137b0b1..d5d799972fefd 100644 --- a/drivers/iio/adc/ti-tsc2046.c +++ b/drivers/iio/adc/ti-tsc2046.c @@ -762,6 +762,11 @@ static int tsc2046_adc_probe(struct spi_device *spi) } dcfg = device_get_match_data(dev); + if (!dcfg) { + const struct spi_device_id *id = spi_get_device_id(spi); + + dcfg = (const struct tsc2046_adc_dcfg *)id->driver_data; + } if (!dcfg) return -EINVAL; @@ -878,11 +883,18 @@ static const struct of_device_id ads7950_of_table[] = { }; MODULE_DEVICE_TABLE(of, ads7950_of_table); +static const struct spi_device_id tsc2046_adc_spi_ids[] = { + { "tsc2046e-adc", (unsigned long)&tsc2046_adc_dcfg_tsc2046e }, + { } +}; +MODULE_DEVICE_TABLE(spi, tsc2046_adc_spi_ids); + static struct spi_driver tsc2046_adc_driver = { .driver = { .name = "tsc2046", .of_match_table = ads7950_of_table, }, + .id_table = tsc2046_adc_spi_ids, .probe = tsc2046_adc_probe, .remove = tsc2046_adc_remove, };
Add spi_device_id to silent following kernel runtime warning: "SPI driver tsc2046 has no spi_device_id for ti,tsc2046e-adc". Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- changes v3: - add missing point - remove unneeded blank line - assignment id at the definition line changes v2: - attach actual driver_data - use spi_get_device_id fallback --- drivers/iio/adc/ti-tsc2046.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)