summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-09-11 18:27:23 +0200
committerSebastian Reichel <sebastian.reichel@collabora.com>2020-10-03 22:17:50 +0200
commit7da9f17fc2b9a3493c6fd55e96521485035bc670 (patch)
tree2149ec57bd7b0138e94a5d92061b26e26dab8280 /drivers/power
parentee2d433cb47338cd40af800cdab5133f62edca10 (diff)
downloadlinux-stable-7da9f17fc2b9a3493c6fd55e96521485035bc670.tar.gz
linux-stable-7da9f17fc2b9a3493c6fd55e96521485035bc670.tar.bz2
linux-stable-7da9f17fc2b9a3493c6fd55e96521485035bc670.zip
power: supply: bq24257: 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/bq24257_charger.c:1155:36: warning: 'bq24257_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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/bq24257_charger.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/supply/bq24257_charger.c b/drivers/power/supply/bq24257_charger.c
index 8e60cb0f3c3f..96cb3290bcaa 100644
--- a/drivers/power/supply/bq24257_charger.c
+++ b/drivers/power/supply/bq24257_charger.c
@@ -1152,6 +1152,7 @@ static const struct of_device_id bq24257_of_match[] = {
};
MODULE_DEVICE_TABLE(of, bq24257_of_match);
+#ifdef CONFIG_ACPI
static const struct acpi_device_id bq24257_acpi_match[] = {
{ "BQ242500", BQ24250 },
{ "BQ242510", BQ24251 },
@@ -1159,6 +1160,7 @@ static const struct acpi_device_id bq24257_acpi_match[] = {
{},
};
MODULE_DEVICE_TABLE(acpi, bq24257_acpi_match);
+#endif
static struct i2c_driver bq24257_driver = {
.driver = {