2015-07-27 02:56:25

by Vaishali Thakkar

Subject: [PATCH] Input: da9052_onkey: Convert to managed resources

Use managed resource functions devm_input_allocate_device and
devm_kzalloc. To be compatible with the change, replace various
gotos by direct returns and drop unneeded labels.

Signed-off-by: Vaishali Thakkar <[email protected]>
---
drivers/input/misc/da9052_onkey.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 266e07f..3243fe9 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -84,12 +84,11 @@ static int da9052_onkey_probe(struct platform_device *pdev)
return -EINVAL;
}

- onkey = kzalloc(sizeof(*onkey), GFP_KERNEL);
- input_dev = input_allocate_device();
+ onkey = devm_kzalloc(&pdev->dev, sizeof(*onkey), GFP_KERNEL);
+ input_dev = devm_input_allocate_device(&pdev->dev);
if (!onkey || !input_dev) {
dev_err(&pdev->dev, "Failed to allocate memory\n");
- error = -ENOMEM;
- goto err_free_mem;
+ return -ENOMEM;
}

onkey->input = input_dev;
@@ -108,7 +107,7 @@ static int da9052_onkey_probe(struct platform_device *pdev)
if (error < 0) {
dev_err(onkey->da9052->dev,
"Failed to register ONKEY IRQ: %d\n", error);
- goto err_free_mem;
+ return error;
}

error = input_register_device(onkey->input);
@@ -124,9 +123,6 @@ static int da9052_onkey_probe(struct platform_device *pdev)
err_free_irq:
da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey);
cancel_delayed_work_sync(&onkey->work);
-err_free_mem:
- input_free_device(input_dev);
- kfree(onkey);

return error;
}
@@ -138,9 +134,6 @@ static int da9052_onkey_remove(struct platform_device *pdev)
da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey);
cancel_delayed_work_sync(&onkey->work);

- input_unregister_device(onkey->input);
- kfree(onkey);
-
return 0;
}

--
1.9.1

2015-08-04 12:53:10

by Steve Twiss

Subject: RE: [PATCH] Input: da9052_onkey: Convert to managed resources

On 27 July 2015 03:56, Vaishali Thakkar wrote:

> Subject: [PATCH] Input: da9052_onkey: Convert to managed resources
>
> Use managed resource functions devm_input_allocate_device and
> devm_kzalloc. To be compatible with the change, replace various
> gotos by direct returns and drop unneeded labels.
>
> Signed-off-by: Vaishali Thakkar <[email protected]>
> ---
> drivers/input/misc/da9052_onkey.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/input/misc/da9052_onkey.c
> b/drivers/input/misc/da9052_onkey.c
> index 266e07f..3243fe9 100644
> --- a/drivers/input/misc/da9052_onkey.c
> +++ b/drivers/input/misc/da9052_onkey.c
> @@ -84,12 +84,11 @@ static int da9052_onkey_probe(struct
> platform_device *pdev)
> return -EINVAL;
> }
>
> - onkey = kzalloc(sizeof(*onkey), GFP_KERNEL);
> - input_dev = input_allocate_device();
> + onkey = devm_kzalloc(&pdev->dev, sizeof(*onkey), GFP_KERNEL);
> + input_dev = devm_input_allocate_device(&pdev->dev);
> if (!onkey || !input_dev) {
> dev_err(&pdev->dev, "Failed to allocate memory\n");
> - error = -ENOMEM;
> - goto err_free_mem;
> + return -ENOMEM;
> }
>
> onkey->input = input_dev;
> @@ -108,7 +107,7 @@ static int da9052_onkey_probe(struct
> platform_device *pdev)
> if (error < 0) {
> dev_err(onkey->da9052->dev,
> "Failed to register ONKEY IRQ: %d\n", error);
> - goto err_free_mem;
> + return error;
> }
>
> error = input_register_device(onkey->input);
> @@ -124,9 +123,6 @@ static int da9052_onkey_probe(struct
> platform_device *pdev)
> err_free_irq:
> da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey);
> cancel_delayed_work_sync(&onkey->work);
> -err_free_mem:
> - input_free_device(input_dev);
> - kfree(onkey);
>
> return error;
> }
> @@ -138,9 +134,6 @@ static int da9052_onkey_remove(struct
> platform_device *pdev)
> da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey);
> cancel_delayed_work_sync(&onkey->work);
>
> - input_unregister_device(onkey->input);
> - kfree(onkey);
> -
> return 0;
> }
>
> --
> 1.9.1

Acked-by: Steve Twiss <[email protected]>