Input: gpio_keys - annotate PM methods as __maybe_unused

dtor · dtor · commit f9645f225842 · 2016-11-07T16:24:30.000-08:00
Instead of using #ifdef, let's mark suspend and resume methods as
__maybe_unused to provide better compile coverage.

Tested-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
@@ -814,8 +814,7 @@ static int gpio_keys_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int gpio_keys_suspend(struct device *dev)
+static int __maybe_unused gpio_keys_suspend(struct device *dev)
 {
 	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
 	struct input_dev *input = ddata->input;
@@ -837,7 +836,7 @@ static int gpio_keys_suspend(struct device *dev)
 	return 0;
 }
 
-static int gpio_keys_resume(struct device *dev)
+static int __maybe_unused gpio_keys_resume(struct device *dev)
 {
 	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
 	struct input_dev *input = ddata->input;
@@ -863,7 +862,6 @@ static int gpio_keys_resume(struct device *dev)
 	gpio_keys_report_state(ddata);
 	return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(gpio_keys_pm_ops, gpio_keys_suspend, gpio_keys_resume);
 

Original file line number	Diff line number	Diff line change
`@@ -814,8 +814,7 @@ static int gpio_keys_remove(struct platform_device *pdev)`
`814`	`814`	`return 0;`
`815`	`815`	`}`
`816`	`816`
`817`		`-#ifdef CONFIG_PM_SLEEP`
`818`		`-static int gpio_keys_suspend(struct device *dev)`
	`817`	`+static int __maybe_unused gpio_keys_suspend(struct device *dev)`
`819`	`818`	`{`
`820`	`819`	`struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);`
`821`	`820`	`struct input_dev *input = ddata->input;`
`@@ -837,7 +836,7 @@ static int gpio_keys_suspend(struct device *dev)`
`837`	`836`	`return 0;`
`838`	`837`	`}`
`839`	`838`
`840`		`-static int gpio_keys_resume(struct device *dev)`
	`839`	`+static int __maybe_unused gpio_keys_resume(struct device *dev)`
`841`	`840`	`{`
`842`	`841`	`struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);`
`843`	`842`	`struct input_dev *input = ddata->input;`
`@@ -863,7 +862,6 @@ static int gpio_keys_resume(struct device *dev)`
`863`	`862`	`gpio_keys_report_state(ddata);`
`864`	`863`	`return 0;`
`865`	`864`	`}`
`866`		`-#endif`
`867`	`865`
`868`	`866`	`static SIMPLE_DEV_PM_OPS(gpio_keys_pm_ops, gpio_keys_suspend, gpio_keys_resume);`
`869`	`867`