summaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-06 09:48:20 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-22 00:23:16 -0800
commit2031717544cab77b9b6fd8c33fd24cbbe2f607b6 (patch)
tree9f4fe4408611ff96df1673c6091989889a1b77c8 /drivers/input/misc
parent8010e0db7071bdcd0fbd47983e88990d6ce979fb (diff)
downloadlwn-2031717544cab77b9b6fd8c33fd24cbbe2f607b6.tar.gz
lwn-2031717544cab77b9b6fd8c33fd24cbbe2f607b6.zip
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')
-rw-r--r--drivers/input/misc/pwm-beeper.c6
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)
static int pwm_beeper_probe(struct platform_device *pdev)
{
- unsigned long pwm_id = (unsigned long)dev_get_platdata(&pdev->dev);
struct pwm_beeper *beeper;
int error;
@@ -105,11 +104,6 @@ static int pwm_beeper_probe(struct platform_device *pdev)
beeper->pwm = pwm_get(&pdev->dev, NULL);
if (IS_ERR(beeper->pwm)) {
- dev_dbg(&pdev->dev, "unable to request PWM, trying legacy API\n");
- beeper->pwm = pwm_request(pwm_id, "pwm beeper");
- }
-
- if (IS_ERR(beeper->pwm)) {
error = PTR_ERR(beeper->pwm);
dev_err(&pdev->dev, "Failed to request pwm device: %d\n", error);
goto err_free;