Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1553017 > unrolled thread

[PATCH 1/3] Input: pwm-beeper - remove calls to legacy pwm_request API

Started byDmitry Torokhov <dmitry.torokhov@gmail.com>
First post2017-01-06 19:30 +0100
Last post2017-01-06 19:30 +0100
Articles 3 — 1 participant

Back to article view | Back to linux.kernel


Contents

  [PATCH 1/3] Input: pwm-beeper - remove calls to legacy pwm_request API Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-06 19:30 +0100
    [PATCH 3/3] Input: pwm-beeper - use input_set_capability() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-06 19:30 +0100
      [PATCH 3/3 v2] Input: pwm-beeper - use input_set_capability() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-06 19:30 +0100

#1553017 — [PATCH 1/3] Input: pwm-beeper - remove calls to legacy pwm_request API

FromDmitry Torokhov <dmitry.torokhov@gmail.com>
Date2017-01-06 19:30 +0100
Subject[PATCH 1/3] Input: pwm-beeper - remove calls to legacy pwm_request API
Message-ID<sWHr4-5KI-3@gated-at.bofh.it>
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.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/pwm-beeper.c | 6 ------
 1 file changed, 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;
-- 
2.11.0.390.gc69c2f50cf-goog

[toc] | [next] | [standalone]


#1553018 — [PATCH 3/3] Input: pwm-beeper - use input_set_capability()

FromDmitry Torokhov <dmitry.torokhov@gmail.com>
Date2017-01-06 19:30 +0100
Subject[PATCH 3/3] Input: pwm-beeper - use input_set_capability()
Message-ID<sWHr4-5KI-9@gated-at.bofh.it>
In reply to#1553017
Instead of manipulating capability bits directly, let's use
input_set_capability() API.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/pwm-beeper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index 14c52054f5b7..90e8eea8607d 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -131,8 +131,8 @@ static int pwm_beeper_probe(struct platform_device *pdev)
 	beeper->input->id.product = 0x0001;
 	beeper->input->id.version = 0x0100;
 
-	beeper->input->evbit[0] = BIT(EV_SND);
-	beeper->input->sndbit[0] = BIT(SND_TONE) | BIT(SND_BELL);
+	inptut_set_capability(beeper->input, EV_SND, SND_TONE);
+	inptut_set_capability(beeper->input, EV_SND, SND_BELL);
 
 	beeper->input->event = pwm_beeper_event;
 	beeper->input->close = pwm_beeper_close;
-- 
2.11.0.390.gc69c2f50cf-goog

[toc] | [prev] | [next] | [standalone]


#1553023 — [PATCH 3/3 v2] Input: pwm-beeper - use input_set_capability()

FromDmitry Torokhov <dmitry.torokhov@gmail.com>
Date2017-01-06 19:30 +0100
Subject[PATCH 3/3 v2] Input: pwm-beeper - use input_set_capability()
Message-ID<sWHr5-5KI-39@gated-at.bofh.it>
In reply to#1553018
Instead of manipulating capability bits directly, let's use
input_set_capability() API.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/pwm-beeper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index 14c52054f5b7..ce6eec48ec5f 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -131,8 +131,8 @@ static int pwm_beeper_probe(struct platform_device *pdev)
 	beeper->input->id.product = 0x0001;
 	beeper->input->id.version = 0x0100;
 
-	beeper->input->evbit[0] = BIT(EV_SND);
-	beeper->input->sndbit[0] = BIT(SND_TONE) | BIT(SND_BELL);
+	input_set_capability(beeper->input, EV_SND, SND_TONE);
+	input_set_capability(beeper->input, EV_SND, SND_BELL);
 
 	beeper->input->event = pwm_beeper_event;
 	beeper->input->close = pwm_beeper_close;
-- 
2.11.0.390.gc69c2f50cf-goog

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web