iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: pwm-beeper - switch to using managed resources

Browse Source 
Use of managed resources (devm) simplifies error handling and tear down
of the driver.

Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Tested-by: David Lechner <david@lechnology.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2017-01-06 09:50:14 -08:00
parent 2031717544
commit bcf4b0460b
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/input/misc/pwm-beeper.c
View File

@ -95,18 +95,19 @@ static void pwm_beeper_close(struct input_dev *input)
static int pwm_beeper_probe(struct platform_device *pdev) static int pwm_beeper_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct pwm_beeper *beeper; struct pwm_beeper *beeper;
int error; int error;
beeper = kzalloc(sizeof(*beeper), GFP_KERNEL); beeper = devm_kzalloc(dev, sizeof(*beeper), GFP_KERNEL);
if (!beeper) if (!beeper)
return -ENOMEM; return -ENOMEM;
beeper->pwm = pwm_get(&pdev->dev, NULL); beeper->pwm = devm_pwm_get(dev, NULL);
if (IS_ERR(beeper->pwm)) { if (IS_ERR(beeper->pwm)) {
error = PTR_ERR(beeper->pwm); error = PTR_ERR(beeper->pwm);
dev_err(&pdev->dev, "Failed to request pwm device: %d\n", error); dev_err(dev, "Failed to request PWM device: %d\n", error);
goto err_free; return error;
} }
/* /*
@ -117,13 +118,11 @@ static int pwm_beeper_probe(struct platform_device *pdev)
INIT_WORK(&beeper->work, pwm_beeper_work); INIT_WORK(&beeper->work, pwm_beeper_work);
beeper->input = input_allocate_device(); beeper->input = devm_input_allocate_device(dev);
if (!beeper->input) { if (!beeper->input) {
dev_err(&pdev->dev, "Failed to allocate input device\n"); dev_err(dev, "Failed to allocate input device\n");
error = -ENOMEM; return -ENOMEM;
goto err_pwm_free;
} }
beeper->input->dev.parent = &pdev->dev;
beeper->input->name = "pwm-beeper"; beeper->input->name = "pwm-beeper";
beeper->input->phys = "pwm/input0"; beeper->input->phys = "pwm/input0";
@ -142,34 +141,12 @@ static int pwm_beeper_probe(struct platform_device *pdev)
error = input_register_device(beeper->input); error = input_register_device(beeper->input);
if (error) { if (error) {
dev_err(&pdev->dev, "Failed to register input device: %d\n", error); dev_err(dev, "Failed to register input device: %d\n", error);
goto err_input_free; return error;
} }
platform_set_drvdata(pdev, beeper); platform_set_drvdata(pdev, beeper);
return 0;
err_input_free:
input_free_device(beeper->input);
err_pwm_free:
pwm_free(beeper->pwm);
err_free:
kfree(beeper);
return error;
}
static int pwm_beeper_remove(struct platform_device *pdev)
{
struct pwm_beeper *beeper = platform_get_drvdata(pdev);
input_unregister_device(beeper->input);
pwm_free(beeper->pwm);
kfree(beeper);
return 0; return 0;
} }
@ -205,7 +182,6 @@ MODULE_DEVICE_TABLE(of, pwm_beeper_match);
static struct platform_driver pwm_beeper_driver = { static struct platform_driver pwm_beeper_driver = {
.probe = pwm_beeper_probe, .probe = pwm_beeper_probe,
.remove = pwm_beeper_remove,
.driver = { .driver = {
.name = "pwm-beeper", .name = "pwm-beeper",
.pm = &pwm_beeper_pm_ops, .pm = &pwm_beeper_pm_ops,