| Message ID | 20210816115953.72533-3-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: mlxbf2: Introduce proper interrupt handling | expand |
On Mon, Aug 16, 2021 at 2:00 PM 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 adding ifdeffery here and there, drop ACPI_PTR() and > replace acpi.h with mod_devicetable.h. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-mlxbf2.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c > index 68c471c10fa4..c0aa622fef76 100644 > --- a/drivers/gpio/gpio-mlxbf2.c > +++ b/drivers/gpio/gpio-mlxbf2.c > @@ -1,6 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > > -#include <linux/acpi.h> > #include <linux/bitfield.h> > #include <linux/bitops.h> > #include <linux/device.h> > @@ -8,6 +7,7 @@ > #include <linux/io.h> > #include <linux/ioport.h> > #include <linux/kernel.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/pm.h> > @@ -307,14 +307,14 @@ static SIMPLE_DEV_PM_OPS(mlxbf2_pm_ops, mlxbf2_gpio_suspend, mlxbf2_gpio_resume) > > static const struct acpi_device_id __maybe_unused mlxbf2_gpio_acpi_match[] = { > { "MLNXBF22", 0 }, > - {}, > + {} Ninja change :) I removed it - send a separate patch for this if you want to. Bart > }; > MODULE_DEVICE_TABLE(acpi, mlxbf2_gpio_acpi_match); > > static struct platform_driver mlxbf2_gpio_driver = { > .driver = { > .name = "mlxbf2_gpio", > - .acpi_match_table = ACPI_PTR(mlxbf2_gpio_acpi_match), > + .acpi_match_table = mlxbf2_gpio_acpi_match, > .pm = &mlxbf2_pm_ops, > }, > .probe = mlxbf2_gpio_probe, > -- > 2.30.2 >
diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c index 68c471c10fa4..c0aa622fef76 100644 --- a/drivers/gpio/gpio-mlxbf2.c +++ b/drivers/gpio/gpio-mlxbf2.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -#include <linux/acpi.h> #include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/device.h> @@ -8,6 +7,7 @@ #include <linux/io.h> #include <linux/ioport.h> #include <linux/kernel.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> @@ -307,14 +307,14 @@ static SIMPLE_DEV_PM_OPS(mlxbf2_pm_ops, mlxbf2_gpio_suspend, mlxbf2_gpio_resume) static const struct acpi_device_id __maybe_unused mlxbf2_gpio_acpi_match[] = { { "MLNXBF22", 0 }, - {}, + {} }; MODULE_DEVICE_TABLE(acpi, mlxbf2_gpio_acpi_match); static struct platform_driver mlxbf2_gpio_driver = { .driver = { .name = "mlxbf2_gpio", - .acpi_match_table = ACPI_PTR(mlxbf2_gpio_acpi_match), + .acpi_match_table = mlxbf2_gpio_acpi_match, .pm = &mlxbf2_pm_ops, }, .probe = mlxbf2_gpio_probe,
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 adding ifdeffery here and there, drop ACPI_PTR() and replace acpi.h with mod_devicetable.h. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-mlxbf2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)