UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio:adc:ti-adc081c: Drop of_match_ptr and change to mod_devicetable.h 

Whilst this driver already supports explicit ACPI bindings we
might as well also allow for PRP0001 based binding.

I'm also keen to remove of_match_ptr from IIO drivers to avoid
this (now) anti-pattern getting coppied into new drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Jonathan Cameron 2020-06-28 13:36:46 +01:00
parent 34eb7366bc
commit b087374944
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iio/adc/ti-adc081c.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/mod_devicetable.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
@ -230,7 +230,6 @@ static const struct i2c_device_id adc081c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, adc081c_id); MODULE_DEVICE_TABLE(i2c, adc081c_id);
#ifdef CONFIG_OF
static const struct of_device_id adc081c_of_match[] = { static const struct of_device_id adc081c_of_match[] = {
{ .compatible = "ti,adc081c" }, { .compatible = "ti,adc081c" },
{ .compatible = "ti,adc101c" }, { .compatible = "ti,adc101c" },
@ -238,7 +237,6 @@ static const struct of_device_id adc081c_of_match[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(of, adc081c_of_match); MODULE_DEVICE_TABLE(of, adc081c_of_match);
#endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id adc081c_acpi_match[] = { static const struct acpi_device_id adc081c_acpi_match[] = {
@ -253,7 +251,7 @@ MODULE_DEVICE_TABLE(acpi, adc081c_acpi_match);
static struct i2c_driver adc081c_driver = { static struct i2c_driver adc081c_driver = {
.driver = { .driver = {
.name = "adc081c", .name = "adc081c",
.of_match_table = of_match_ptr(adc081c_of_match), .of_match_table = adc081c_of_match,
.acpi_match_table = ACPI_PTR(adc081c_acpi_match), .acpi_match_table = ACPI_PTR(adc081c_acpi_match),
}, },
.probe = adc081c_probe, .probe = adc081c_probe,