From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Daniel Campello <campello@chromium.org>
Cc: LKML <devicetree@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Douglas Anderson <dianders@chromium.org>,
Enrico Granata <egranata@chromium.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Stephen Boyd <swboyd@chromium.org>,
linux-iio <linux-iio@vger.kernel.org>
Subject: Re: [PATCH 05/15] iio: sx9310: Change from .probe to .probe_new
Date: Tue, 28 Jul 2020 21:10:18 +0300 [thread overview]
Message-ID: <CAHp75VfYuXzUipa9+NPgWNeP5MCYq7OdNQKQvPcnrKw+V7+Ekw@mail.gmail.com> (raw)
In-Reply-To: <20200728091057.5.I0ea31fe183b99838b28213df05b0e7912db3ba29@changeid>
On Tue, Jul 28, 2020 at 6:15 PM Daniel Campello <campello@chromium.org> wrote:
>
> Uses .probe_new in place of .probe. Also uses device_get_match_data()
> for whoami matching.
Good one!
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Daniel Campello <campello@chromium.org>
> ---
>
> drivers/iio/proximity/sx9310.c | 37 ++++++++++++----------------------
> 1 file changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
> index 0fb88ad66f7342..de52afd7c13333 100644
> --- a/drivers/iio/proximity/sx9310.c
> +++ b/drivers/iio/proximity/sx9310.c
> @@ -138,7 +138,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[] = {
> @@ -859,24 +859,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", whoami);
> return -ENODEV;
> + }
>
> switch (whoami) {
> case SX9310_WHOAMI_VALUE:
> @@ -893,8 +884,7 @@ static int sx9310_set_indio_dev_name(struct device *dev,
> 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;
> @@ -920,8 +910,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;
>
> @@ -1034,8 +1023,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);
> @@ -1054,7 +1043,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);
> --
> 2.28.0.rc0.142.g3c755180ce-goog
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-07-28 18:10 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 0:40 [PATCH] iio: sx9310: Fixes dropped on initial commit Daniel Campello
2020-07-26 8:10 ` Andy Shevchenko
2020-07-26 11:53 ` Jonathan Cameron
2020-07-28 15:12 ` [PATCH 00/15] sx9310 iio driver updates Daniel Campello
2020-07-28 15:12 ` [PATCH 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-28 22:06 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 19:42 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-07-28 18:08 ` Andy Shevchenko
2020-07-28 20:07 ` Daniel Campello
2020-07-28 20:15 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-28 18:09 ` Andy Shevchenko
2020-07-28 20:47 ` Daniel Campello
2020-07-28 21:28 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 18:10 ` Andy Shevchenko [this message]
2020-07-28 19:32 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 06/15] iio: sx9310: Align memory Daniel Campello
2020-07-28 18:11 ` Andy Shevchenko
2020-07-28 21:26 ` Daniel Campello
2020-07-29 6:52 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-28 18:13 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 18:14 ` Andy Shevchenko
2020-07-28 19:37 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 09/15] iio: sx9310: Update copyright Daniel Campello
2020-07-28 15:12 ` [PATCH 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-28 18:15 ` Andy Shevchenko
2020-07-28 19:40 ` Stephen Boyd
2020-07-28 21:23 ` Daniel Campello
2020-07-28 21:32 ` Stephen Boyd
2020-07-28 22:06 ` Daniel Campello
2020-07-28 15:12 ` [PATCH 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 18:16 ` Andy Shevchenko
2020-07-28 19:41 ` Stephen Boyd
2020-07-28 15:12 ` [PATCH 13/15] iio: sx9310: Add newlines to printks Daniel Campello
2020-07-28 18:19 ` Andy Shevchenko
2020-07-28 18:24 ` Joe Perches
2020-07-28 18:32 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 14/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 18:20 ` Andy Shevchenko
2020-07-28 15:12 ` [PATCH 15/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-28 18:21 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 00/14] sx9310 iio driver updates Daniel Campello
2020-07-28 23:05 ` [PATCH v2 01/14] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-29 0:52 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 02/14] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 23:05 ` [PATCH v2 03/14] iio: sx9310: Fix irq handling Daniel Campello
2020-07-29 8:40 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 04/14] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-29 6:54 ` Andy Shevchenko
2020-07-29 8:38 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 05/14] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 23:05 ` [PATCH v2 06/14] iio: sx9310: Fixes various memory handling Daniel Campello
2020-07-28 23:05 ` [PATCH v2 07/14] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-29 1:03 ` Stephen Boyd
2020-07-29 7:00 ` Andy Shevchenko
2020-07-31 15:44 ` Daniel Campello
2020-07-31 15:52 ` Andy Shevchenko
2020-07-28 23:05 ` [PATCH v2 08/14] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 23:05 ` [PATCH v2 09/14] iio: sx9310: Update copyright Daniel Campello
2020-07-28 23:05 ` [PATCH v2 10/14] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-29 8:42 ` Stephen Boyd
2020-07-28 23:05 ` [PATCH v2 11/14] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 23:05 ` [PATCH v2 12/14] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 23:05 ` [PATCH v2 13/14] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 23:05 ` [PATCH v2 14/14] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-29 0:50 ` [PATCH v2 00/14] sx9310 iio driver updates Stephen Boyd
2020-07-29 9:20 ` Stephen Boyd
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=CAHp75VfYuXzUipa9+NPgWNeP5MCYq7OdNQKQvPcnrKw+V7+Ekw@mail.gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=campello@chromium.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=egranata@chromium.org \
--cc=jic23@kernel.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).