2020-07-07 11:05:09

by Axel Lin

Subject: [PATCH] mfd/axp20x-i2c: Fix "CONFIG_ACPI" is not defined warning

Fix below build warning:

drivers/mfd/axp20x-i2c.c:82:5: warning: "CONFIG_ACPI" is not defined, evaluates to 0 [-Wundef]
82 | #if CONFIG_ACPI
| ^~~~~~~~~~~

Fixes: 20f359cb236b ("mfd: axp20x-i2c: Do not define 'struct acpi_device_id' when !CONFIG_ACPI")
Signed-off-by: Axel Lin <[email protected]>
---
drivers/mfd/axp20x-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
index bd271fbe1ec1..3c930316d48b 100644
--- a/drivers/mfd/axp20x-i2c.c
+++ b/drivers/mfd/axp20x-i2c.c
@@ -79,7 +79,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);

-#if CONFIG_ACPI
+#ifdef CONFIG_ACPI
static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
{
.id = "INT33F4",
--
2.25.1

2020-07-08 07:50:17

by Lee Jones

Subject: Re: [PATCH] mfd/axp20x-i2c: Fix "CONFIG_ACPI" is not defined warning

On Tue, 07 Jul 2020, Axel Lin wrote:

> Fix below build warning:
>
> drivers/mfd/axp20x-i2c.c:82:5: warning: "CONFIG_ACPI" is not defined, evaluates to 0 [-Wundef]
> 82 | #if CONFIG_ACPI
> | ^~~~~~~~~~~
>
> Fixes: 20f359cb236b ("mfd: axp20x-i2c: Do not define 'struct acpi_device_id' when !CONFIG_ACPI")
> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/mfd/axp20x-i2c.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

This should already be fixed.

Thanks anyway Axel.

> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
> index bd271fbe1ec1..3c930316d48b 100644
> --- a/drivers/mfd/axp20x-i2c.c
> +++ b/drivers/mfd/axp20x-i2c.c
> @@ -79,7 +79,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
> };
> MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>
> -#if CONFIG_ACPI
> +#ifdef CONFIG_ACPI
> static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
> {
> .id = "INT33F4",

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog