Merge tag 'v4.0-rc5' into next

[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 a28ee70..e82edf8 100644 (file)
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -50,7 +50,6 @@ static int pwm_beeper_event(struct input_dev *input,
        }
 
        if (value == 0) {
-               pwm_config(beeper->pwm, 0, 0);
                pwm_disable(beeper->pwm);
        } else {
                period = HZ_TO_NANOSECONDS(value);
@@ -169,12 +168,6 @@ static int __maybe_unused pwm_beeper_resume(struct device *dev)
 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
-#endif
-
 #ifdef CONFIG_OF
 static const struct of_device_id pwm_beeper_match[] = {
        { .compatible = "pwm-beeper", },
@@ -187,7 +180,7 @@ static struct platform_driver pwm_beeper_driver = {
        .remove = pwm_beeper_remove,
        .driver = {
                .name   = "pwm-beeper",
-               .pm     = PWM_BEEPER_PM_OPS,
+               .pm     = &pwm_beeper_pm_ops,
                .of_match_table = of_match_ptr(pwm_beeper_match),
        },
 };