| Message ID | 20191216181925.927-2-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/3] iio: st_lsm6dsx: Mark predefined constants with __maybe_unused | expand |
On Mon, 16 Dec 2019 20:19:24 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > There is no need to have OF guard against ID table. > Drop it for good. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Agreed. Good to slowly push out this bit of legacy... Applied to the togreg branch of iio.git and pushed out as testing. Thanks, Jonathan > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 3 +-- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > index cd47ec1fedcb..0fb32131afce 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > @@ -12,7 +12,6 @@ > #include <linux/module.h> > #include <linux/i2c.h> > #include <linux/slab.h> > -#include <linux/of.h> > #include <linux/regmap.h> > > #include "st_lsm6dsx.h" > @@ -122,7 +121,7 @@ static struct i2c_driver st_lsm6dsx_driver = { > .driver = { > .name = "st_lsm6dsx_i2c", > .pm = &st_lsm6dsx_pm_ops, > - .of_match_table = of_match_ptr(st_lsm6dsx_i2c_of_match), > + .of_match_table = st_lsm6dsx_i2c_of_match, > }, > .probe = st_lsm6dsx_i2c_probe, > .id_table = st_lsm6dsx_i2c_id_table, > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > index 67ff36eac247..eb1086e4a951 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > @@ -12,7 +12,6 @@ > #include <linux/module.h> > #include <linux/spi/spi.h> > #include <linux/slab.h> > -#include <linux/of.h> > #include <linux/regmap.h> > > #include "st_lsm6dsx.h" > @@ -122,7 +121,7 @@ static struct spi_driver st_lsm6dsx_driver = { > .driver = { > .name = "st_lsm6dsx_spi", > .pm = &st_lsm6dsx_pm_ops, > - .of_match_table = of_match_ptr(st_lsm6dsx_spi_of_match), > + .of_match_table = st_lsm6dsx_spi_of_match, > }, > .probe = st_lsm6dsx_spi_probe, > .id_table = st_lsm6dsx_spi_id_table,
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c index cd47ec1fedcb..0fb32131afce 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/i2c.h> #include <linux/slab.h> -#include <linux/of.h> #include <linux/regmap.h> #include "st_lsm6dsx.h" @@ -122,7 +121,7 @@ static struct i2c_driver st_lsm6dsx_driver = { .driver = { .name = "st_lsm6dsx_i2c", .pm = &st_lsm6dsx_pm_ops, - .of_match_table = of_match_ptr(st_lsm6dsx_i2c_of_match), + .of_match_table = st_lsm6dsx_i2c_of_match, }, .probe = st_lsm6dsx_i2c_probe, .id_table = st_lsm6dsx_i2c_id_table, diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c index 67ff36eac247..eb1086e4a951 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/spi/spi.h> #include <linux/slab.h> -#include <linux/of.h> #include <linux/regmap.h> #include "st_lsm6dsx.h" @@ -122,7 +121,7 @@ static struct spi_driver st_lsm6dsx_driver = { .driver = { .name = "st_lsm6dsx_spi", .pm = &st_lsm6dsx_pm_ops, - .of_match_table = of_match_ptr(st_lsm6dsx_spi_of_match), + .of_match_table = st_lsm6dsx_spi_of_match, }, .probe = st_lsm6dsx_spi_probe, .id_table = st_lsm6dsx_spi_id_table,
There is no need to have OF guard against ID table. Drop it for good. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 3 +-- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)