[PATCH] Input: pwm-beeper - Use devm functions

[Fabio Estevam <fabio.estevam@freescale.com>]

By using devm functions the code can be simplified a bit.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/input/misc/pwm-beeper.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index a28ee70..c5ccaee 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -72,11 +72,11 @@ static int pwm_beeper_probe(struct platform_device *pdev)
 	struct pwm_beeper *beeper;
 	int error;
 
-	beeper = kzalloc(sizeof(*beeper), GFP_KERNEL);
+	beeper = devm_kzalloc(&pdev->dev, sizeof(*beeper), GFP_KERNEL);
 	if (!beeper)
 		return -ENOMEM;
 
-	beeper->pwm = pwm_get(&pdev->dev, NULL);
+	beeper->pwm = devm_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");
@@ -85,14 +85,13 @@ static int pwm_beeper_probe(struct platform_device *pdev)
 	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;
+		return error;
 	}
 
-	beeper->input = input_allocate_device();
+	beeper->input = devm_input_allocate_device(&pdev->dev);
 	if (!beeper->input) {
 		dev_err(&pdev->dev, "Failed to allocate input device\n");
-		error = -ENOMEM;
-		goto err_pwm_free;
+		return -ENOMEM;
 	}
 	beeper->input->dev.parent = &pdev->dev;
 
@@ -122,10 +121,6 @@ static int pwm_beeper_probe(struct platform_device *pdev)
 
 err_input_free:
 	input_free_device(beeper->input);
-err_pwm_free:
-	pwm_free(beeper->pwm);
-err_free:
-	kfree(beeper);
 
 	return error;
 }
@@ -137,9 +132,6 @@ static int pwm_beeper_remove(struct platform_device *pdev)
 	input_unregister_device(beeper->input);
 
 	pwm_disable(beeper->pwm);
-	pwm_free(beeper->pwm);
-
-	kfree(beeper);
 
 	return 0;
 }
-- 
1.9.1