| Message ID | 20191216173853.75797-8-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/9] iio: light: st_uvis25: Drop unneeded header inclusion | expand |
On Mon, 16 Dec 2019 19:38:52 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Since we have access to the struct device_driver and thus to the ID table, > there is no need to supply special parameters to st_sensors_of_name_probe(). > > Besides that we have a common API to get driver match data, there is > no need to do matching separately for OF and ACPI. > > Taking into consideration above, simplify the ST sensors code. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> This looks good to me, but its big enough that purely on that basis I'd like to leave it a little longer to let Denis / Lorezo or someone else have time to take a look. If I seem to have lost it by the end of the first week in January, give me a poke. I may have drunk a few things before then ;) Thanks, Jonathan > --- > drivers/iio/accel/st_accel_spi.c | 3 +- > .../iio/common/st_sensors/st_sensors_core.c | 38 +++++++++---------- > .../iio/common/st_sensors/st_sensors_i2c.c | 21 ---------- > drivers/iio/gyro/st_gyro_i2c.c | 3 +- > drivers/iio/gyro/st_gyro_spi.c | 3 +- > drivers/iio/magnetometer/st_magn_i2c.c | 3 +- > drivers/iio/magnetometer/st_magn_spi.c | 3 +- > drivers/iio/pressure/st_pressure_i2c.c | 14 +------ > drivers/iio/pressure/st_pressure_spi.c | 3 +- > include/linux/iio/common/st_sensors.h | 12 +----- > include/linux/iio/common/st_sensors_i2c.h | 10 ----- > 11 files changed, 25 insertions(+), 88 deletions(-) > > diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c > index 8af7027d5598..3e25268638e2 100644 > --- a/drivers/iio/accel/st_accel_spi.c > +++ b/drivers/iio/accel/st_accel_spi.c > @@ -107,8 +107,7 @@ static int st_accel_spi_probe(struct spi_device *spi) > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&spi->dev, st_accel_of_match, > - spi->modalias, sizeof(spi->modalias)); > + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); > > settings = st_accel_get_settings(spi->modalias); > if (!settings) { > diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c > index 4a3064fb6cd9..42a71a50650f 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_core.c > +++ b/drivers/iio/common/st_sensors/st_sensors_core.c > @@ -12,6 +12,7 @@ > #include <linux/slab.h> > #include <linux/delay.h> > #include <linux/iio/iio.h> > +#include <linux/property.h> > #include <linux/regulator/consumer.h> > #include <linux/of.h> > #include <linux/of_device.h> > @@ -340,42 +341,37 @@ static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, > > return pdata; > } > +#else > +static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, > + struct st_sensors_platform_data *defdata) > +{ > + return NULL; > +} > +#endif > > /** > - * st_sensors_of_name_probe() - device tree probe for ST sensor name > + * st_sensors_dev_name_probe() - device probe for ST sensor name > * @dev: driver model representation of the device. > - * @match: the OF match table for the device, containing compatible strings > - * but also a .data field with the corresponding internal kernel name > - * used by this sensor. > * @name: device name buffer reference. > * @len: device name buffer length. > * > - * In effect this function matches a compatible string to an internal kernel > + * In effect this function matches an ID to an internal kernel > * name for a certain sensor device, so that the rest of the autodetection can > * rely on that name from this point on. I2C/SPI devices will be renamed > * to match the internal kernel convention. > */ > -void st_sensors_of_name_probe(struct device *dev, > - const struct of_device_id *match, > - char *name, int len) > +void st_sensors_dev_name_probe(struct device *dev, char *name, int len) > { > - const struct of_device_id *of_id; > + const void *match; > > - of_id = of_match_device(match, dev); > - if (!of_id || !of_id->data) > + match = device_get_match_data(dev); > + if (!match) > return; > > - /* The name from the OF match takes precedence if present */ > - strlcpy(name, of_id->data, len); > + /* The name from the match takes precedence if present */ > + strlcpy(name, match, len); > } > -EXPORT_SYMBOL(st_sensors_of_name_probe); > -#else > -static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, > - struct st_sensors_platform_data *defdata) > -{ > - return NULL; > -} > -#endif > +EXPORT_SYMBOL(st_sensors_dev_name_probe); > > int st_sensors_init_sensor(struct iio_dev *indio_dev, > struct st_sensors_platform_data *pdata) > diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c > index aa89d54a7c59..286830fb5d35 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c > +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c > @@ -11,8 +11,6 @@ > #include <linux/module.h> > #include <linux/slab.h> > #include <linux/iio/iio.h> > -#include <linux/of_device.h> > -#include <linux/acpi.h> > #include <linux/regmap.h> > > #include <linux/iio/common/st_sensors_i2c.h> > @@ -68,25 +66,6 @@ int st_sensors_i2c_configure(struct iio_dev *indio_dev, > } > EXPORT_SYMBOL(st_sensors_i2c_configure); > > -#ifdef CONFIG_ACPI > -int st_sensors_match_acpi_device(struct device *dev) > -{ > - const struct acpi_device_id *acpi_id; > - kernel_ulong_t driver_data = 0; > - > - if (ACPI_HANDLE(dev)) { > - acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (!acpi_id) { > - dev_err(dev, "No driver data\n"); > - return -EINVAL; > - } > - driver_data = acpi_id->driver_data; > - } > - return driver_data; > -} > -EXPORT_SYMBOL(st_sensors_match_acpi_device); > -#endif > - > MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>"); > MODULE_DESCRIPTION("STMicroelectronics ST-sensors i2c driver"); > MODULE_LICENSE("GPL v2"); > diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c > index 05a1a0874bd5..bc0010835ac0 100644 > --- a/drivers/iio/gyro/st_gyro_i2c.c > +++ b/drivers/iio/gyro/st_gyro_i2c.c > @@ -70,8 +70,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client, > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&client->dev, st_gyro_of_match, > - client->name, sizeof(client->name)); > + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); > > settings = st_gyro_get_settings(client->name); > if (!settings) { > diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c > index b5c624251231..07224d5bf299 100644 > --- a/drivers/iio/gyro/st_gyro_spi.c > +++ b/drivers/iio/gyro/st_gyro_spi.c > @@ -74,8 +74,7 @@ static int st_gyro_spi_probe(struct spi_device *spi) > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&spi->dev, st_gyro_of_match, > - spi->modalias, sizeof(spi->modalias)); > + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); > > settings = st_gyro_get_settings(spi->modalias); > if (!settings) { > diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c > index fdba480a12be..bf63777bbc6e 100644 > --- a/drivers/iio/magnetometer/st_magn_i2c.c > +++ b/drivers/iio/magnetometer/st_magn_i2c.c > @@ -62,8 +62,7 @@ static int st_magn_i2c_probe(struct i2c_client *client, > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&client->dev, st_magn_of_match, > - client->name, sizeof(client->name)); > + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); > > settings = st_magn_get_settings(client->name); > if (!settings) { > diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c > index fbf909bde841..78f846fc120e 100644 > --- a/drivers/iio/magnetometer/st_magn_spi.c > +++ b/drivers/iio/magnetometer/st_magn_spi.c > @@ -56,8 +56,7 @@ static int st_magn_spi_probe(struct spi_device *spi) > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&spi->dev, st_magn_of_match, > - spi->modalias, sizeof(spi->modalias)); > + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); > > settings = st_magn_get_settings(spi->modalias); > if (!settings) { > diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c > index 6203bc9d5c2d..dd1f515ca1f1 100644 > --- a/drivers/iio/pressure/st_pressure_i2c.c > +++ b/drivers/iio/pressure/st_pressure_i2c.c > @@ -10,7 +10,6 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/slab.h> > -#include <linux/acpi.h> > #include <linux/i2c.h> > #include <linux/iio/iio.h> > > @@ -83,18 +82,7 @@ static int st_press_i2c_probe(struct i2c_client *client, > struct iio_dev *indio_dev; > int ret; > > - if (client->dev.of_node) { > - st_sensors_of_name_probe(&client->dev, st_press_of_match, > - client->name, sizeof(client->name)); > - } else if (ACPI_HANDLE(&client->dev)) { > - ret = st_sensors_match_acpi_device(&client->dev); > - if ((ret < 0) || (ret >= ST_PRESS_MAX)) > - return -ENODEV; > - > - strlcpy(client->name, st_press_id_table[ret].name, > - sizeof(client->name)); > - } else if (!id) > - return -ENODEV; > + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); > > settings = st_press_get_settings(client->name); > if (!settings) { > diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c > index 7c8b70221e70..dd31241bf4b4 100644 > --- a/drivers/iio/pressure/st_pressure_spi.c > +++ b/drivers/iio/pressure/st_pressure_spi.c > @@ -66,8 +66,7 @@ static int st_press_spi_probe(struct spi_device *spi) > struct iio_dev *indio_dev; > int err; > > - st_sensors_of_name_probe(&spi->dev, st_press_of_match, > - spi->modalias, sizeof(spi->modalias)); > + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); > > settings = st_press_get_settings(spi->modalias); > if (!settings) { > diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h > index 686be532f4cb..33e939977444 100644 > --- a/include/linux/iio/common/st_sensors.h > +++ b/include/linux/iio/common/st_sensors.h > @@ -315,16 +315,6 @@ ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev, > ssize_t st_sensors_sysfs_scale_avail(struct device *dev, > struct device_attribute *attr, char *buf); > > -#ifdef CONFIG_OF > -void st_sensors_of_name_probe(struct device *dev, > - const struct of_device_id *match, > - char *name, int len); > -#else > -static inline void st_sensors_of_name_probe(struct device *dev, > - const struct of_device_id *match, > - char *name, int len) > -{ > -} > -#endif > +void st_sensors_dev_name_probe(struct device *dev, char *name, int len); > > #endif /* ST_SENSORS_H */ > diff --git a/include/linux/iio/common/st_sensors_i2c.h b/include/linux/iio/common/st_sensors_i2c.h > index 01e424e2af4f..5f15cf01036c 100644 > --- a/include/linux/iio/common/st_sensors_i2c.h > +++ b/include/linux/iio/common/st_sensors_i2c.h > @@ -12,18 +12,8 @@ > > #include <linux/i2c.h> > #include <linux/iio/common/st_sensors.h> > -#include <linux/of.h> > > int st_sensors_i2c_configure(struct iio_dev *indio_dev, > struct i2c_client *client); > > -#ifdef CONFIG_ACPI > -int st_sensors_match_acpi_device(struct device *dev); > -#else > -static inline int st_sensors_match_acpi_device(struct device *dev) > -{ > - return -ENODEV; > -} > -#endif > - > #endif /* ST_SENSORS_I2C_H */
On Mon, Dec 23, 2019 at 04:28:10PM +0000, Jonathan Cameron wrote: > On Mon, 16 Dec 2019 19:38:52 +0200 > Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > > Since we have access to the struct device_driver and thus to the ID table, > > there is no need to supply special parameters to st_sensors_of_name_probe(). > > > > Besides that we have a common API to get driver match data, there is > > no need to do matching separately for OF and ACPI. > > > > Taking into consideration above, simplify the ST sensors code. > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > This looks good to me, but its big enough that purely on that basis I'd > like to leave it a little longer to let Denis / Lorezo or someone else have time > to take a look. > > If I seem to have lost it by the end of the first week in January, give > me a poke. I may have drunk a few things before then ;) Gentle ping.
On Mon, 13 Jan 2020 15:58:10 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > On Mon, Dec 23, 2019 at 04:28:10PM +0000, Jonathan Cameron wrote: > > On Mon, 16 Dec 2019 19:38:52 +0200 > > Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > > > > Since we have access to the struct device_driver and thus to the ID table, > > > there is no need to supply special parameters to st_sensors_of_name_probe(). > > > > > > Besides that we have a common API to get driver match data, there is > > > no need to do matching separately for OF and ACPI. > > > > > > Taking into consideration above, simplify the ST sensors code. > > > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > This looks good to me, but its big enough that purely on that basis I'd > > like to leave it a little longer to let Denis / Lorezo or someone else have time > > to take a look. > > > > If I seem to have lost it by the end of the first week in January, give > > me a poke. I may have drunk a few things before then ;) > > Gentle ping. > Thanks. Applied to the togreg branch of iio.git and pushed out as testing. Jonathan
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c index 8af7027d5598..3e25268638e2 100644 --- a/drivers/iio/accel/st_accel_spi.c +++ b/drivers/iio/accel/st_accel_spi.c @@ -107,8 +107,7 @@ static int st_accel_spi_probe(struct spi_device *spi) struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&spi->dev, st_accel_of_match, - spi->modalias, sizeof(spi->modalias)); + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); settings = st_accel_get_settings(spi->modalias); if (!settings) { diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index 4a3064fb6cd9..42a71a50650f 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c @@ -12,6 +12,7 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/iio/iio.h> +#include <linux/property.h> #include <linux/regulator/consumer.h> #include <linux/of.h> #include <linux/of_device.h> @@ -340,42 +341,37 @@ static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, return pdata; } +#else +static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, + struct st_sensors_platform_data *defdata) +{ + return NULL; +} +#endif /** - * st_sensors_of_name_probe() - device tree probe for ST sensor name + * st_sensors_dev_name_probe() - device probe for ST sensor name * @dev: driver model representation of the device. - * @match: the OF match table for the device, containing compatible strings - * but also a .data field with the corresponding internal kernel name - * used by this sensor. * @name: device name buffer reference. * @len: device name buffer length. * - * In effect this function matches a compatible string to an internal kernel + * In effect this function matches an ID to an internal kernel * name for a certain sensor device, so that the rest of the autodetection can * rely on that name from this point on. I2C/SPI devices will be renamed * to match the internal kernel convention. */ -void st_sensors_of_name_probe(struct device *dev, - const struct of_device_id *match, - char *name, int len) +void st_sensors_dev_name_probe(struct device *dev, char *name, int len) { - const struct of_device_id *of_id; + const void *match; - of_id = of_match_device(match, dev); - if (!of_id || !of_id->data) + match = device_get_match_data(dev); + if (!match) return; - /* The name from the OF match takes precedence if present */ - strlcpy(name, of_id->data, len); + /* The name from the match takes precedence if present */ + strlcpy(name, match, len); } -EXPORT_SYMBOL(st_sensors_of_name_probe); -#else -static struct st_sensors_platform_data *st_sensors_of_probe(struct device *dev, - struct st_sensors_platform_data *defdata) -{ - return NULL; -} -#endif +EXPORT_SYMBOL(st_sensors_dev_name_probe); int st_sensors_init_sensor(struct iio_dev *indio_dev, struct st_sensors_platform_data *pdata) diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c index aa89d54a7c59..286830fb5d35 100644 --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c @@ -11,8 +11,6 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/iio/iio.h> -#include <linux/of_device.h> -#include <linux/acpi.h> #include <linux/regmap.h> #include <linux/iio/common/st_sensors_i2c.h> @@ -68,25 +66,6 @@ int st_sensors_i2c_configure(struct iio_dev *indio_dev, } EXPORT_SYMBOL(st_sensors_i2c_configure); -#ifdef CONFIG_ACPI -int st_sensors_match_acpi_device(struct device *dev) -{ - const struct acpi_device_id *acpi_id; - kernel_ulong_t driver_data = 0; - - if (ACPI_HANDLE(dev)) { - acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!acpi_id) { - dev_err(dev, "No driver data\n"); - return -EINVAL; - } - driver_data = acpi_id->driver_data; - } - return driver_data; -} -EXPORT_SYMBOL(st_sensors_match_acpi_device); -#endif - MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>"); MODULE_DESCRIPTION("STMicroelectronics ST-sensors i2c driver"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c index 05a1a0874bd5..bc0010835ac0 100644 --- a/drivers/iio/gyro/st_gyro_i2c.c +++ b/drivers/iio/gyro/st_gyro_i2c.c @@ -70,8 +70,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client, struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&client->dev, st_gyro_of_match, - client->name, sizeof(client->name)); + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); settings = st_gyro_get_settings(client->name); if (!settings) { diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c index b5c624251231..07224d5bf299 100644 --- a/drivers/iio/gyro/st_gyro_spi.c +++ b/drivers/iio/gyro/st_gyro_spi.c @@ -74,8 +74,7 @@ static int st_gyro_spi_probe(struct spi_device *spi) struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&spi->dev, st_gyro_of_match, - spi->modalias, sizeof(spi->modalias)); + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); settings = st_gyro_get_settings(spi->modalias); if (!settings) { diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c index fdba480a12be..bf63777bbc6e 100644 --- a/drivers/iio/magnetometer/st_magn_i2c.c +++ b/drivers/iio/magnetometer/st_magn_i2c.c @@ -62,8 +62,7 @@ static int st_magn_i2c_probe(struct i2c_client *client, struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&client->dev, st_magn_of_match, - client->name, sizeof(client->name)); + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); settings = st_magn_get_settings(client->name); if (!settings) { diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c index fbf909bde841..78f846fc120e 100644 --- a/drivers/iio/magnetometer/st_magn_spi.c +++ b/drivers/iio/magnetometer/st_magn_spi.c @@ -56,8 +56,7 @@ static int st_magn_spi_probe(struct spi_device *spi) struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&spi->dev, st_magn_of_match, - spi->modalias, sizeof(spi->modalias)); + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); settings = st_magn_get_settings(spi->modalias); if (!settings) { diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c index 6203bc9d5c2d..dd1f515ca1f1 100644 --- a/drivers/iio/pressure/st_pressure_i2c.c +++ b/drivers/iio/pressure/st_pressure_i2c.c @@ -10,7 +10,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/acpi.h> #include <linux/i2c.h> #include <linux/iio/iio.h> @@ -83,18 +82,7 @@ static int st_press_i2c_probe(struct i2c_client *client, struct iio_dev *indio_dev; int ret; - if (client->dev.of_node) { - st_sensors_of_name_probe(&client->dev, st_press_of_match, - client->name, sizeof(client->name)); - } else if (ACPI_HANDLE(&client->dev)) { - ret = st_sensors_match_acpi_device(&client->dev); - if ((ret < 0) || (ret >= ST_PRESS_MAX)) - return -ENODEV; - - strlcpy(client->name, st_press_id_table[ret].name, - sizeof(client->name)); - } else if (!id) - return -ENODEV; + st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name)); settings = st_press_get_settings(client->name); if (!settings) { diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c index 7c8b70221e70..dd31241bf4b4 100644 --- a/drivers/iio/pressure/st_pressure_spi.c +++ b/drivers/iio/pressure/st_pressure_spi.c @@ -66,8 +66,7 @@ static int st_press_spi_probe(struct spi_device *spi) struct iio_dev *indio_dev; int err; - st_sensors_of_name_probe(&spi->dev, st_press_of_match, - spi->modalias, sizeof(spi->modalias)); + st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias)); settings = st_press_get_settings(spi->modalias); if (!settings) { diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h index 686be532f4cb..33e939977444 100644 --- a/include/linux/iio/common/st_sensors.h +++ b/include/linux/iio/common/st_sensors.h @@ -315,16 +315,6 @@ ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev, ssize_t st_sensors_sysfs_scale_avail(struct device *dev, struct device_attribute *attr, char *buf); -#ifdef CONFIG_OF -void st_sensors_of_name_probe(struct device *dev, - const struct of_device_id *match, - char *name, int len); -#else -static inline void st_sensors_of_name_probe(struct device *dev, - const struct of_device_id *match, - char *name, int len) -{ -} -#endif +void st_sensors_dev_name_probe(struct device *dev, char *name, int len); #endif /* ST_SENSORS_H */ diff --git a/include/linux/iio/common/st_sensors_i2c.h b/include/linux/iio/common/st_sensors_i2c.h index 01e424e2af4f..5f15cf01036c 100644 --- a/include/linux/iio/common/st_sensors_i2c.h +++ b/include/linux/iio/common/st_sensors_i2c.h @@ -12,18 +12,8 @@ #include <linux/i2c.h> #include <linux/iio/common/st_sensors.h> -#include <linux/of.h> int st_sensors_i2c_configure(struct iio_dev *indio_dev, struct i2c_client *client); -#ifdef CONFIG_ACPI -int st_sensors_match_acpi_device(struct device *dev); -#else -static inline int st_sensors_match_acpi_device(struct device *dev) -{ - return -ENODEV; -} -#endif - #endif /* ST_SENSORS_I2C_H */
Since we have access to the struct device_driver and thus to the ID table, there is no need to supply special parameters to st_sensors_of_name_probe(). Besides that we have a common API to get driver match data, there is no need to do matching separately for OF and ACPI. Taking into consideration above, simplify the ST sensors code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/accel/st_accel_spi.c | 3 +- .../iio/common/st_sensors/st_sensors_core.c | 38 +++++++++---------- .../iio/common/st_sensors/st_sensors_i2c.c | 21 ---------- drivers/iio/gyro/st_gyro_i2c.c | 3 +- drivers/iio/gyro/st_gyro_spi.c | 3 +- drivers/iio/magnetometer/st_magn_i2c.c | 3 +- drivers/iio/magnetometer/st_magn_spi.c | 3 +- drivers/iio/pressure/st_pressure_i2c.c | 14 +------ drivers/iio/pressure/st_pressure_spi.c | 3 +- include/linux/iio/common/st_sensors.h | 12 +----- include/linux/iio/common/st_sensors_i2c.h | 10 ----- 11 files changed, 25 insertions(+), 88 deletions(-)