From: Krzysztof Kozlowski <krzk@kernel.org>
Date: Fri, 11 Sep 2020 16:27:27 +0000 (+0200)
Subject: power: supply: rt9455: skip 'struct acpi_device_id' when !CONFIG_ACPI
X-Git-Tag: v5.10-rc1~72^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bcb3dae01da624e353ba3acdcd045a2fe540675;p=thirdparty%2Fkernel%2Flinux.git

power: supply: rt9455: skip 'struct acpi_device_id' when !CONFIG_ACPI

Since ACPI_PTR() is used to NULLify the value when !CONFIG_ACPI, the
struct acpi_device_id becomes unused:

  drivers/power/supply/rt9455_charger.c:1734:36: warning:
    'rt9455_i2c_acpi_match' defined but not used [-Wunused-const-variable=]

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---

diff --git a/drivers/power/supply/rt9455_charger.c b/drivers/power/supply/rt9455_charger.c
index 29161ae902456..594bb3b8a4d1e 100644
--- a/drivers/power/supply/rt9455_charger.c
+++ b/drivers/power/supply/rt9455_charger.c
@@ -1731,11 +1731,13 @@ static const struct of_device_id rt9455_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, rt9455_of_match);
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id rt9455_i2c_acpi_match[] = {
 	{ "RT945500", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(acpi, rt9455_i2c_acpi_match);
+#endif
 
 static struct i2c_driver rt9455_driver = {
 	.probe		= rt9455_probe,