openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio:pressure:zpa2326: Drop of_match_ptr protection 

This prevents use of this driver with ACPI via PRP0001 and is
an example of an anti pattern I'm trying to remove from IIO.
Hence drop from this driver.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Gregor Boirie <gregor.boirie@parrot.com>
Link: https://lore.kernel.org/r/20200910173242.621168-21-jic23@kernel.org
This commit is contained in:
Jonathan Cameron 2020-09-10 18:32:24 +01:00
parent 444f5f854b
commit a409d2b639
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iio/pressure/zpa2326_i2c.c
View File

@ -10,7 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/of_device.h> #include <linux/mod_devicetable.h>
#include "zpa2326.h" #include "zpa2326.h"
/* /*
@ -66,18 +66,16 @@ static const struct i2c_device_id zpa2326_i2c_ids[] = {
}; };
MODULE_DEVICE_TABLE(i2c, zpa2326_i2c_ids); MODULE_DEVICE_TABLE(i2c, zpa2326_i2c_ids);
#if defined(CONFIG_OF)
static const struct of_device_id zpa2326_i2c_matches[] = { static const struct of_device_id zpa2326_i2c_matches[] = {
{ .compatible = "murata,zpa2326" }, { .compatible = "murata,zpa2326" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, zpa2326_i2c_matches); MODULE_DEVICE_TABLE(of, zpa2326_i2c_matches);
#endif
static struct i2c_driver zpa2326_i2c_driver = { static struct i2c_driver zpa2326_i2c_driver = {
.driver = { .driver = {
.name = "zpa2326-i2c", .name = "zpa2326-i2c",
.of_match_table = of_match_ptr(zpa2326_i2c_matches), .of_match_table = zpa2326_i2c_matches,
.pm = ZPA2326_PM_OPS, .pm = ZPA2326_PM_OPS,
}, },
.probe = zpa2326_probe_i2c, .probe = zpa2326_probe_i2c,

6
drivers/iio/pressure/zpa2326_spi.c
View File

@ -10,7 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/of_device.h> #include <linux/mod_devicetable.h>
#include "zpa2326.h" #include "zpa2326.h"
/* /*
@ -70,18 +70,16 @@ static const struct spi_device_id zpa2326_spi_ids[] = {
}; };
MODULE_DEVICE_TABLE(spi, zpa2326_spi_ids); MODULE_DEVICE_TABLE(spi, zpa2326_spi_ids);
#if defined(CONFIG_OF)
static const struct of_device_id zpa2326_spi_matches[] = { static const struct of_device_id zpa2326_spi_matches[] = {
{ .compatible = "murata,zpa2326" }, { .compatible = "murata,zpa2326" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, zpa2326_spi_matches); MODULE_DEVICE_TABLE(of, zpa2326_spi_matches);
#endif
static struct spi_driver zpa2326_spi_driver = { static struct spi_driver zpa2326_spi_driver = {
.driver = { .driver = {
.name = "zpa2326-spi", .name = "zpa2326-spi",
.of_match_table = of_match_ptr(zpa2326_spi_matches), .of_match_table = zpa2326_spi_matches,
.pm = ZPA2326_PM_OPS, .pm = ZPA2326_PM_OPS,
}, },
.probe = zpa2326_probe_spi, .probe = zpa2326_probe_spi,