diff mbox series

[05/15] iio: sx9310: Change from .probe to .probe_new

Message ID 20200728091057.5.I0ea31fe183b99838b28213df05b0e7912db3ba29@changeid (mailing list archive)
State New
Headers show
Series sx9310 iio driver updates | expand

Commit Message

Daniel Campello July 28, 2020, 3:12 p.m. UTC
Uses .probe_new in place of .probe. Also uses device_get_match_data()
for whoami matching.

Signed-off-by: Daniel Campello <campello@chromium.org>
---

 drivers/iio/proximity/sx9310.c | 37 ++++++++++++----------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

Comments

Andy Shevchenko July 28, 2020, 6:10 p.m. UTC | #1
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
>
Stephen Boyd July 28, 2020, 7:32 p.m. UTC | #2
Quoting Daniel Campello (2020-07-28 08:12:48)
> 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: Stephen Boyd <swboyd@chromium.org>
diff mbox series

Patch

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);