| Message ID | 20241024191200.229894-18-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: Clean up acpi_match_device() use cases | expand |
On Thu, 24 Oct 2024 22:05:06 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > IIO core (ACPI part) provides a generic helper that may be used in > the driver. Replace custom implementation of iio_get_acpi_device_name(). > > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied. > --- > drivers/iio/accel/mma9551.c | 19 ++++--------------- > 1 file changed, 4 insertions(+), 15 deletions(-) > > diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c > index fa1799b0b0df..a5d20d8d08b8 100644 > --- a/drivers/iio/accel/mma9551.c > +++ b/drivers/iio/accel/mma9551.c > @@ -4,11 +4,11 @@ > * Copyright (c) 2014, Intel Corporation. > */ > > -#include <linux/module.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > #include <linux/slab.h> > -#include <linux/acpi.h> > #include <linux/delay.h> > #include <linux/gpio/consumer.h> > #include <linux/iio/iio.h> > @@ -435,17 +435,6 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev) > return 0; > } > > -static const char *mma9551_match_acpi_device(struct device *dev) > -{ > - const struct acpi_device_id *id; > - > - id = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (!id) > - return NULL; > - > - return dev_name(dev); > -} > - > static int mma9551_probe(struct i2c_client *client) > { > const struct i2c_device_id *id = i2c_client_get_device_id(client); > @@ -464,8 +453,8 @@ static int mma9551_probe(struct i2c_client *client) > > if (id) > name = id->name; > - else if (ACPI_HANDLE(&client->dev)) > - name = mma9551_match_acpi_device(&client->dev); > + else > + name = iio_get_acpi_device_name(&client->dev); > > ret = mma9551_init(data); > if (ret < 0)
diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index fa1799b0b0df..a5d20d8d08b8 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -4,11 +4,11 @@ * Copyright (c) 2014, Intel Corporation. */ -#include <linux/module.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/slab.h> -#include <linux/acpi.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/iio/iio.h> @@ -435,17 +435,6 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev) return 0; } -static const char *mma9551_match_acpi_device(struct device *dev) -{ - const struct acpi_device_id *id; - - id = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!id) - return NULL; - - return dev_name(dev); -} - static int mma9551_probe(struct i2c_client *client) { const struct i2c_device_id *id = i2c_client_get_device_id(client); @@ -464,8 +453,8 @@ static int mma9551_probe(struct i2c_client *client) if (id) name = id->name; - else if (ACPI_HANDLE(&client->dev)) - name = mma9551_match_acpi_device(&client->dev); + else + name = iio_get_acpi_device_name(&client->dev); ret = mma9551_init(data); if (ret < 0)