aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-02 16:58:55 +0100
committerSebastian Reichel <sre@kernel.org>2016-03-03 15:12:08 +0100
commit298cb0f19267d8f4bbd7ce74732fb24d92befbea (patch)
tree4c89ddcf52b3046947565efaadf2dfd45dbc34e1
parentpower_supply: 88pm860x_charger: do not pass NULL to power_supply_put (diff)
downloadlinux-dev-298cb0f19267d8f4bbd7ce74732fb24d92befbea.tar.xz
linux-dev-298cb0f19267d8f4bbd7ce74732fb24d92befbea.zip
power: ipaq-micro-battery: use __maybe_unused to hide pm functions
The ipaq micro battery driver has suspend/resume functions that are accessed using SIMPLE_DEV_PM_OPS, which hide the reference when CONFIG_PM_SLEEP is not set, resulting in a warning about unused functions: drivers/power/ipaq_micro_battery.c:284:12: error: 'micro_batt_suspend' defined but not used [-Werror=unused-function] drivers/power/ipaq_micro_battery.c:292:12: error: 'micro_batt_resume' defined but not used [-Werror=unused-function] This adds __maybe_unused annotations to let the compiler know it can silently drop the function definition. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r--drivers/power/ipaq_micro_battery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ipaq_micro_battery.c b/drivers/power/ipaq_micro_battery.c
index f03014ea1dc4..3f314b1a30d7 100644
--- a/drivers/power/ipaq_micro_battery.c
+++ b/drivers/power/ipaq_micro_battery.c
@@ -281,7 +281,7 @@ static int micro_batt_remove(struct platform_device *pdev)
return 0;
}
-static int micro_batt_suspend(struct device *dev)
+static int __maybe_unused micro_batt_suspend(struct device *dev)
{
struct micro_battery *mb = dev_get_drvdata(dev);
@@ -289,7 +289,7 @@ static int micro_batt_suspend(struct device *dev)
return 0;
}
-static int micro_batt_resume(struct device *dev)
+static int __maybe_unused micro_batt_resume(struct device *dev)
{
struct micro_battery *mb = dev_get_drvdata(dev);