diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/misc/pwm-beeper.c | |
| parent | a1f9a4072655843fc03186acbad65990cc05dd2d (diff) | |
| parent | 1d6a01365fd63fbf7c2709a183e2936728c8efad (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/misc/pwm-beeper.c')
| -rw-r--r-- | drivers/input/misc/pwm-beeper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index 8ef288e7c971..93f640a38d94 100644 --- 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) | |||
| 144 | return 0; | 144 | return 0; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | #ifdef CONFIG_PM_SLEEP | 147 | static int __maybe_unused pwm_beeper_suspend(struct device *dev) |
| 148 | static int pwm_beeper_suspend(struct device *dev) | ||
| 149 | { | 148 | { |
| 150 | struct pwm_beeper *beeper = dev_get_drvdata(dev); | 149 | struct pwm_beeper *beeper = dev_get_drvdata(dev); |
| 151 | 150 | ||
| @@ -155,7 +154,7 @@ static int pwm_beeper_suspend(struct device *dev) | |||
| 155 | return 0; | 154 | return 0; |
| 156 | } | 155 | } |
| 157 | 156 | ||
| 158 | static int pwm_beeper_resume(struct device *dev) | 157 | static int __maybe_unused pwm_beeper_resume(struct device *dev) |
| 159 | { | 158 | { |
| 160 | struct pwm_beeper *beeper = dev_get_drvdata(dev); | 159 | struct pwm_beeper *beeper = dev_get_drvdata(dev); |
| 161 | 160 | ||
| @@ -170,6 +169,7 @@ static int pwm_beeper_resume(struct device *dev) | |||
| 170 | static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops, | 169 | static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops, |
| 171 | pwm_beeper_suspend, pwm_beeper_resume); | 170 | pwm_beeper_suspend, pwm_beeper_resume); |
| 172 | 171 | ||
| 172 | #ifdef CONFIG_PM_SLEEP | ||
| 173 | #define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops) | 173 | #define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops) |
| 174 | #else | 174 | #else |
| 175 | #define PWM_BEEPER_PM_OPS NULL | 175 | #define PWM_BEEPER_PM_OPS NULL |