projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
input
/
misc
/
pwm-beeper.c
diff --git
a/drivers/input/misc/pwm-beeper.c
b/drivers/input/misc/pwm-beeper.c
index
294aa48
..
a28ee70
100644
(file)
--- a/
drivers/input/misc/pwm-beeper.c
+++ b/
drivers/input/misc/pwm-beeper.c
@@
-144,8
+144,7
@@
static int pwm_beeper_remove(struct platform_device *pdev)
return 0;
}
return 0;
}
-#ifdef CONFIG_PM_SLEEP
-static int pwm_beeper_suspend(struct device *dev)
+static int __maybe_unused pwm_beeper_suspend(struct device *dev)
{
struct pwm_beeper *beeper = dev_get_drvdata(dev);
{
struct pwm_beeper *beeper = dev_get_drvdata(dev);
@@
-155,7
+154,7
@@
static int pwm_beeper_suspend(struct device *dev)
return 0;
}
return 0;
}
-static int pwm_beeper_resume(struct device *dev)
+static int
__maybe_unused
pwm_beeper_resume(struct device *dev)
{
struct pwm_beeper *beeper = dev_get_drvdata(dev);
{
struct pwm_beeper *beeper = dev_get_drvdata(dev);
@@
-170,6
+169,7
@@
static int pwm_beeper_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
pwm_beeper_suspend, pwm_beeper_resume);
static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
pwm_beeper_suspend, pwm_beeper_resume);
+#ifdef CONFIG_PM_SLEEP
#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
#else
#define PWM_BEEPER_PM_OPS NULL
#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
#else
#define PWM_BEEPER_PM_OPS NULL