aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-19 19:22:31 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-03-08 00:11:50 -0500
commitceb5b6c8bee4841abac9e010c6069934d0f7c996 (patch)
treeb5af4e29e5ef29fe185fbf8b808ae5dc5f0ae6fb /drivers/input/misc
parent902cb3afab8d4c924376de51ec5c02d171992914 (diff)
Input: pwm-beeper - remove unneeded PWM_BEEPER_PM_OPS define
The device->pm pointer is always present so there is no need to do tricks with conditionally defining the pointer. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/pwm-beeper.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index a28ee70ff158..a562071f6385 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -169,12 +169,6 @@ static int __maybe_unused pwm_beeper_resume(struct device *dev)
169static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops, 169static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
170 pwm_beeper_suspend, pwm_beeper_resume); 170 pwm_beeper_suspend, pwm_beeper_resume);
171 171
172#ifdef CONFIG_PM_SLEEP
173#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
174#else
175#define PWM_BEEPER_PM_OPS NULL
176#endif
177
178#ifdef CONFIG_OF 172#ifdef CONFIG_OF
179static const struct of_device_id pwm_beeper_match[] = { 173static const struct of_device_id pwm_beeper_match[] = {
180 { .compatible = "pwm-beeper", }, 174 { .compatible = "pwm-beeper", },
@@ -187,7 +181,7 @@ static struct platform_driver pwm_beeper_driver = {
187 .remove = pwm_beeper_remove, 181 .remove = pwm_beeper_remove,
188 .driver = { 182 .driver = {
189 .name = "pwm-beeper", 183 .name = "pwm-beeper",
190 .pm = PWM_BEEPER_PM_OPS, 184 .pm = &pwm_beeper_pm_ops,
191 .of_match_table = of_match_ptr(pwm_beeper_match), 185 .of_match_table = of_match_ptr(pwm_beeper_match),
192 }, 186 },
193}; 187};