From: Jonathan Cameron <jic23@kernel.org>
To: Daniel Campello <campello@chromium.org>
Cc: LKML <devicetree@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Stephen Boyd <swboyd@chromium.org>,
Douglas Anderson <dianders@chromium.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
linux-iio@vger.kernel.org
Subject: Re: [PATCH v5 05/15] iio: sx9310: Change from .probe to .probe_new
Date: Thu, 6 Aug 2020 19:29:14 +0100 [thread overview]
Message-ID: <20200806192914.71bfec22@archlinux> (raw)
In-Reply-To: <20200803175559.v5.5.Ieb5fdf7381764835dad0b3099c7b19ba754e4c47@changeid>
On Mon, 3 Aug 2020 17:58:05 -0600
Daniel Campello <campello@chromium.org> wrote:
> Uses .probe_new in place of .probe. Also uses device_get_match_data()
> for whoami matching.
>
> Signed-off-by: Daniel Campello <campello@chromium.org>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Applied,
Thanks,
Jonathan
> ---
>
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2:
> - Added '\n' to dev_err()
>
> drivers/iio/proximity/sx9310.c | 39 ++++++++++++----------------------
> 1 file changed, 14 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
> index 9daf2b8591a0a0..66ecdd309e0ddc 100644
> --- a/drivers/iio/proximity/sx9310.c
> +++ b/drivers/iio/proximity/sx9310.c
> @@ -139,7 +139,7 @@ struct sx9310_data {
> struct completion completion;
> unsigned int chan_read, chan_event;
> int channel_users[SX9310_NUM_CHANNELS];
> - int whoami;
> + unsigned int whoami;
> };
>
> static const struct iio_event_spec sx9310_events[] = {
> @@ -858,24 +858,15 @@ static int sx9310_init_device(struct iio_dev *indio_dev)
>
> static int sx9310_set_indio_dev_name(struct device *dev,
> struct iio_dev *indio_dev,
> - const struct i2c_device_id *id, int whoami)
> + unsigned int whoami)
> {
> - const struct acpi_device_id *acpi_id;
> -
> - /* id will be NULL when enumerated via ACPI */
> - if (id) {
> - if (id->driver_data != whoami)
> - dev_err(dev, "WHOAMI does not match i2c_device_id: %s",
> - id->name);
> - } else if (ACPI_HANDLE(dev)) {
> - acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> - if (!acpi_id)
> - return -ENODEV;
> - if (acpi_id->driver_data != whoami)
> - dev_err(dev, "WHOAMI does not match acpi_device_id: %s",
> - acpi_id->id);
> - } else
> + unsigned int long ddata;
> +
> + ddata = (uintptr_t)device_get_match_data(dev);
> + if (ddata != whoami) {
> + dev_err(dev, "WHOAMI does not match device data: %u\n", whoami);
> return -ENODEV;
> + }
>
> switch (whoami) {
> case SX9310_WHOAMI_VALUE:
> @@ -885,15 +876,14 @@ static int sx9310_set_indio_dev_name(struct device *dev,
> indio_dev->name = "sx9311";
> break;
> default:
> - dev_err(dev, "unexpected WHOAMI response: %u", whoami);
> + dev_err(dev, "unexpected WHOAMI response: %u\n", whoami);
> return -ENODEV;
> }
>
> return 0;
> }
>
> -static int sx9310_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int sx9310_probe(struct i2c_client *client)
> {
> int ret;
> struct iio_dev *indio_dev;
> @@ -919,8 +909,7 @@ static int sx9310_probe(struct i2c_client *client,
> return ret;
> }
>
> - ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, id,
> - data->whoami);
> + ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, data->whoami);
> if (ret < 0)
> return ret;
>
> @@ -1033,8 +1022,8 @@ static const struct acpi_device_id sx9310_acpi_match[] = {
> MODULE_DEVICE_TABLE(acpi, sx9310_acpi_match);
>
> static const struct of_device_id sx9310_of_match[] = {
> - { .compatible = "semtech,sx9310" },
> - { .compatible = "semtech,sx9311" },
> + { .compatible = "semtech,sx9310", (void *)SX9310_WHOAMI_VALUE },
> + { .compatible = "semtech,sx9311", (void *)SX9311_WHOAMI_VALUE },
> {},
> };
> MODULE_DEVICE_TABLE(of, sx9310_of_match);
> @@ -1053,7 +1042,7 @@ static struct i2c_driver sx9310_driver = {
> .of_match_table = sx9310_of_match,
> .pm = &sx9310_pm_ops,
> },
> - .probe = sx9310_probe,
> + .probe_new = sx9310_probe,
> .id_table = sx9310_id,
> };
> module_i2c_driver(sx9310_driver);
next prev parent reply other threads:[~2020-08-06 18:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 23:58 [PATCH v5 00/15] sx9310 iio driver updates Daniel Campello
2020-08-03 23:58 ` [PATCH v5 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-08-06 18:14 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-08-06 18:15 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-08-04 7:26 ` Andy Shevchenko
2020-08-03 23:58 ` [PATCH v5 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-08-06 18:28 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-08-06 18:29 ` Jonathan Cameron [this message]
2020-08-03 23:58 ` [PATCH v5 06/15] iio: sx9310: Fixes various memory handling Daniel Campello
2020-08-06 18:29 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-08-06 18:30 ` Jonathan Cameron
2020-08-16 9:36 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-08-03 23:58 ` [PATCH v5 09/15] iio: sx9310: Update copyright Daniel Campello
2020-08-18 1:45 ` Daniel Campello
2020-08-22 10:34 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-08-03 23:58 ` [PATCH v5 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-08-06 18:38 ` Jonathan Cameron
2020-08-03 23:58 ` [PATCH v5 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-08-03 23:58 ` [PATCH v5 13/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-08-03 23:58 ` [PATCH v5 14/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-08-03 23:58 ` [PATCH v5 15/15] iio: sx9310: Use irq trigger flags from firmware Daniel Campello
2020-08-06 18:42 ` Jonathan Cameron
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=20200806192914.71bfec22@archlinux \
--to=jic23@kernel.org \
--cc=andy.shevchenko@gmail.com \
--cc=campello@chromium.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=swboyd@chromium.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).