]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: st_lsm6dsx: Drop unneeded OF code
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 16 Dec 2019 18:19:24 +0000 (20:19 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 29 Dec 2019 15:20:04 +0000 (15:20 +0000)
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>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c

index cd47ec1fedcb92aeb0dc9b88adb8f8b7dd123a8f..0fb32131afce7ccec8c1607e18f424ff4c8831fc 100644 (file)
@@ -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,
index 67ff36eac24769e3488155f8b25550f62f5e1788..eb1086e4a951ae54b1398e0cb00e6d8797421dbe 100644 (file)
@@ -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,