From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH v1 3/3] iio: adc: tsc2046: silent spi_device_id warning
Date: Tue, 30 Aug 2022 13:07:09 +0200 [thread overview]
Message-ID: <20220830110709.2037302-3-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20220830110709.2037302-1-o.rempel@pengutronix.de>
Add spi_device_id to silent following warning:
SPI driver tsc2046 has no spi_device_id for ti,tsc2046e-adc
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/iio/adc/ti-tsc2046.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c
index bbc8b4137b0b1..b9a1fac659d46 100644
--- a/drivers/iio/adc/ti-tsc2046.c
+++ b/drivers/iio/adc/ti-tsc2046.c
@@ -761,7 +761,15 @@ static int tsc2046_adc_probe(struct spi_device *spi)
return -EINVAL;
}
- dcfg = device_get_match_data(dev);
+ if (!dev_fwnode(dev)) {
+ const struct spi_device_id *id;
+
+ id = spi_get_device_id(spi);
+ dcfg = (const struct tsc2046_adc_dcfg *)id->driver_data;
+ } else {
+ dcfg = device_get_match_data(dev);
+ }
+
if (!dcfg)
return -EINVAL;
@@ -878,11 +886,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" },
+ { }
+};
+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
next prev parent reply other threads:[~2022-08-30 11:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 11:07 [PATCH v1 1/3] dt-bindings: iio: adc: ti,tsc2046: add vref-supply property Oleksij Rempel
2022-08-30 11:07 ` [PATCH v1 2/3] iio: adc: tsc2046: add vref support Oleksij Rempel
2022-08-30 11:07 ` Oleksij Rempel [this message]
2022-08-30 13:02 ` [PATCH v1 3/3] iio: adc: tsc2046: silent spi_device_id warning Jonathan Cameron
2022-08-30 16:07 ` Oleksij Rempel
2022-08-30 20:02 ` Andy Shevchenko
2022-08-30 14:31 ` [PATCH v1 1/3] dt-bindings: iio: adc: ti,tsc2046: add vref-supply property Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830110709.2037302-3-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).