Commit 5291fed7 authored by Jonathan Cameron's avatar Jonathan Cameron

iio: light: max44000: drop ACPI_PTR() and CONFIG_ACPI guards

The complexity of config guards needed for ACPI_PTR() is not worthwhile
for the small amount of saved data. This example was doing it correctly
but I am proposing dropping this so as to reduce chance of cut and paste
where it is done wrong.  Also drop now unneeded linux/acpi.h include and
added linux/mod_devicetable.h for struct acpi_device_id definition.
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20231231183514.566609-24-jic23@kernel.orgSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 51feb3e3
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/regmap.h> #include <linux/regmap.h>
...@@ -19,7 +20,6 @@ ...@@ -19,7 +20,6 @@
#include <linux/iio/buffer.h> #include <linux/iio/buffer.h>
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h> #include <linux/iio/triggered_buffer.h>
#include <linux/acpi.h>
#define MAX44000_DRV_NAME "max44000" #define MAX44000_DRV_NAME "max44000"
...@@ -603,18 +603,16 @@ static const struct i2c_device_id max44000_id[] = { ...@@ -603,18 +603,16 @@ static const struct i2c_device_id max44000_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, max44000_id); MODULE_DEVICE_TABLE(i2c, max44000_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id max44000_acpi_match[] = { static const struct acpi_device_id max44000_acpi_match[] = {
{"MAX44000", 0}, {"MAX44000", 0},
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, max44000_acpi_match); MODULE_DEVICE_TABLE(acpi, max44000_acpi_match);
#endif
static struct i2c_driver max44000_driver = { static struct i2c_driver max44000_driver = {
.driver = { .driver = {
.name = MAX44000_DRV_NAME, .name = MAX44000_DRV_NAME,
.acpi_match_table = ACPI_PTR(max44000_acpi_match), .acpi_match_table = max44000_acpi_match,
}, },
.probe = max44000_probe, .probe = max44000_probe,
.id_table = max44000_id, .id_table = max44000_id,
......
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