Commit 8e5a0426 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:magn:ak8975: Drop of_match_ptr and ACPI_PTR protections.

Both would result in only a small size saving.  For simplicity it
is best to remove them.  I also wish to remove both these antipatterns
from IIO.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: default avatarJonathan Albrieux <jonathan.albrieux@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarJonathan Albrieux <jonathan.albrieux@gmail.com>
Link: https://lore.kernel.org/r/20200910173242.621168-35-jic23@kernel.org
parent 03303e84
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/acpi.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
...@@ -773,7 +773,6 @@ static const struct iio_info ak8975_info = { ...@@ -773,7 +773,6 @@ static const struct iio_info ak8975_info = {
.read_raw = &ak8975_read_raw, .read_raw = &ak8975_read_raw,
}; };
#ifdef CONFIG_ACPI
static const struct acpi_device_id ak_acpi_match[] = { static const struct acpi_device_id ak_acpi_match[] = {
{"AK8975", AK8975}, {"AK8975", AK8975},
{"AK8963", AK8963}, {"AK8963", AK8963},
...@@ -785,7 +784,6 @@ static const struct acpi_device_id ak_acpi_match[] = { ...@@ -785,7 +784,6 @@ static const struct acpi_device_id ak_acpi_match[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, ak_acpi_match); MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
#endif
static void ak8975_fill_buffer(struct iio_dev *indio_dev) static void ak8975_fill_buffer(struct iio_dev *indio_dev)
{ {
...@@ -1075,8 +1073,8 @@ static struct i2c_driver ak8975_driver = { ...@@ -1075,8 +1073,8 @@ static struct i2c_driver ak8975_driver = {
.driver = { .driver = {
.name = "ak8975", .name = "ak8975",
.pm = &ak8975_dev_pm_ops, .pm = &ak8975_dev_pm_ops,
.of_match_table = of_match_ptr(ak8975_of_match), .of_match_table = ak8975_of_match,
.acpi_match_table = ACPI_PTR(ak_acpi_match), .acpi_match_table = ak_acpi_match,
}, },
.probe = ak8975_probe, .probe = ak8975_probe,
.remove = ak8975_remove, .remove = ak8975_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment