| Message ID | 20220616142451.10322-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] iio: accel: mma7660: Drop wrong use of ACPI_PTR() | expand |
On Thu, 16 Jun 2022 17:24:51 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > ACPI_PTR() is more harmful than helpful. For example, in this case > if CONFIG_ACPI=n, the ID table left unused which is not what we want. > > Instead of making linker to drop a section, drop ACPI_PTR(). > > As a side effect this makes driver ACPI and OF clean. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied. Thanks, Jonathan > --- > drivers/iio/accel/mma7660.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c > index 112a5a33c29f..794f2f383303 100644 > --- a/drivers/iio/accel/mma7660.c > +++ b/drivers/iio/accel/mma7660.c > @@ -7,8 +7,8 @@ > * IIO driver for Freescale MMA7660FC; 7-bit I2C address: 0x4c. > */ > > -#include <linux/acpi.h> > #include <linux/i2c.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/iio/iio.h> > #include <linux/iio/sysfs.h> > @@ -255,7 +255,7 @@ static const struct of_device_id mma7660_of_match[] = { > }; > MODULE_DEVICE_TABLE(of, mma7660_of_match); > > -static const struct acpi_device_id __maybe_unused mma7660_acpi_id[] = { > +static const struct acpi_device_id mma7660_acpi_id[] = { > {"MMA7660", 0}, > {} > }; > @@ -267,7 +267,7 @@ static struct i2c_driver mma7660_driver = { > .name = "mma7660", > .pm = pm_sleep_ptr(&mma7660_pm_ops), > .of_match_table = mma7660_of_match, > - .acpi_match_table = ACPI_PTR(mma7660_acpi_id), > + .acpi_match_table = mma7660_acpi_id, > }, > .probe = mma7660_probe, > .remove = mma7660_remove,
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c index 112a5a33c29f..794f2f383303 100644 --- a/drivers/iio/accel/mma7660.c +++ b/drivers/iio/accel/mma7660.c @@ -7,8 +7,8 @@ * IIO driver for Freescale MMA7660FC; 7-bit I2C address: 0x4c. */ -#include <linux/acpi.h> #include <linux/i2c.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> @@ -255,7 +255,7 @@ static const struct of_device_id mma7660_of_match[] = { }; MODULE_DEVICE_TABLE(of, mma7660_of_match); -static const struct acpi_device_id __maybe_unused mma7660_acpi_id[] = { +static const struct acpi_device_id mma7660_acpi_id[] = { {"MMA7660", 0}, {} }; @@ -267,7 +267,7 @@ static struct i2c_driver mma7660_driver = { .name = "mma7660", .pm = pm_sleep_ptr(&mma7660_pm_ops), .of_match_table = mma7660_of_match, - .acpi_match_table = ACPI_PTR(mma7660_acpi_id), + .acpi_match_table = mma7660_acpi_id, }, .probe = mma7660_probe, .remove = mma7660_remove,
ACPI_PTR() is more harmful than helpful. For example, in this case if CONFIG_ACPI=n, the ID table left unused which is not what we want. Instead of making linker to drop a section, drop ACPI_PTR(). As a side effect this makes driver ACPI and OF clean. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/accel/mma7660.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)