]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mfd: axp20x-i2c: Do not define 'struct acpi_device_id' when !CONFIG_ACPI
authorLee Jones <lee.jones@linaro.org>
Thu, 25 Jun 2020 09:03:55 +0000 (10:03 +0100)
committerLee Jones <lee.jones@linaro.org>
Tue, 7 Jul 2020 07:13:31 +0000 (08:13 +0100)
Since ACPI_PTR() is used to NULLify the value when !CONFIG_ACPI,
struct axp20x_i2c_acpi_match becomes defined by unused.

This squashes the current W=1 kernel builds warning:

 drivers/mfd/axp20x-i2c.c:82:36: warning: ‘axp20x_i2c_acpi_match’ defined but not used [-Wunused-const-variable=]

Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Carlo Caione <carlo@caione.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/axp20x-i2c.c

index 14f9df74f855cc8cf884e69690f08da85dc06f5d..3c930316d48bcfa974dbd755ac73f05754693f09 100644 (file)
@@ -79,6 +79,7 @@ static const struct i2c_device_id axp20x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
        {
                .id = "INT33F4",
@@ -87,6 +88,7 @@ static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
        { },
 };
 MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
+#endif
 
 static struct i2c_driver axp20x_i2c_driver = {
        .driver = {