diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-06 12:48:20 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-22 03:23:16 -0500 |
commit | 2031717544cab77b9b6fd8c33fd24cbbe2f607b6 (patch) | |
tree | 9f4fe4408611ff96df1673c6091989889a1b77c8 /drivers/input/misc/pwm-beeper.c | |
parent | 8010e0db7071bdcd0fbd47983e88990d6ce979fb (diff) |
Input: pwm-beeper - remove calls to legacy pwm_request API
There are no more users of pwm-beeper driver in mainline relying on
this legacy API, so let's remove it and simplify the driver code.
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Tested-by: David Lechner <david@lechnology.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/pwm-beeper.c')
-rw-r--r-- | drivers/input/misc/pwm-beeper.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index 5f9655d49a65..cb87e475bd23 100644 --- a/drivers/input/misc/pwm-beeper.c +++ b/drivers/input/misc/pwm-beeper.c | |||
@@ -95,7 +95,6 @@ static void pwm_beeper_close(struct input_dev *input) | |||
95 | 95 | ||
96 | static int pwm_beeper_probe(struct platform_device *pdev) | 96 | static int pwm_beeper_probe(struct platform_device *pdev) |
97 | { | 97 | { |
98 | unsigned long pwm_id = (unsigned long)dev_get_platdata(&pdev->dev); | ||
99 | struct pwm_beeper *beeper; | 98 | struct pwm_beeper *beeper; |
100 | int error; | 99 | int error; |
101 | 100 | ||
@@ -105,11 +104,6 @@ static int pwm_beeper_probe(struct platform_device *pdev) | |||
105 | 104 | ||
106 | beeper->pwm = pwm_get(&pdev->dev, NULL); | 105 | beeper->pwm = pwm_get(&pdev->dev, NULL); |
107 | if (IS_ERR(beeper->pwm)) { | 106 | if (IS_ERR(beeper->pwm)) { |
108 | dev_dbg(&pdev->dev, "unable to request PWM, trying legacy API\n"); | ||
109 | beeper->pwm = pwm_request(pwm_id, "pwm beeper"); | ||
110 | } | ||
111 | |||
112 | if (IS_ERR(beeper->pwm)) { | ||
113 | error = PTR_ERR(beeper->pwm); | 107 | error = PTR_ERR(beeper->pwm); |
114 | dev_err(&pdev->dev, "Failed to request pwm device: %d\n", error); | 108 | dev_err(&pdev->dev, "Failed to request pwm device: %d\n", error); |
115 | goto err_free; | 109 | goto err_free; |