2014-05-04 20:35 GMT+08:00 Himangi Saraogi <himangi774@xxxxxxxxx>:
> This patch moves data allocated using kzalloc to managed data allocated
> using devm_kzalloc and cleans now unnecessary kfrees in probe and remove
> functions.
Acked-by: Lan Tianyu <tianyu.lan@xxxxxxxxx>
>
> The following Coccinelle semantic patch was used for making the change:
> @platform@
> identifier p, probefn, removefn;
> @@
> struct platform_driver p = {
> .probe = probefn,
> .remove = removefn,
> };
>
> @prb@
> identifier platform.probefn, pdev;
> expression e, e1, e2;
> @@
> probefn(struct platform_device *pdev, ...) {
> <+...
> - e = kzalloc(e1, e2)
> + e = devm_kzalloc(&pdev->dev, e1, e2)
> ...
> ?-kfree(e);
> ...+>
> }
>
> @rem depends on prb@
> identifier platform.removefn;
> expression e;
> @@
> removefn(...) {
> <...
> - kfree(e);
> ...>
> }
>
> Signed-off-by: Himangi Saraogi <himangi774@xxxxxxxxx>
> ---
> drivers/acpi/ac.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
> index 2c01c1d..98b613a 100644
> --- a/drivers/acpi/ac.c
> +++ b/drivers/acpi/ac.c
> @@ -205,7 +205,7 @@ static int acpi_ac_probe(struct platform_device *pdev)
> if (!adev)
> return -ENODEV;
>
> - ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL);
> + ac = devm_kzalloc(&pdev->dev, sizeof(struct acpi_ac), GFP_KERNEL);
> if (!ac)
> return -ENOMEM;
>
> @@ -240,9 +240,6 @@ static int acpi_ac_probe(struct platform_device *pdev)
> ac->battery_nb.notifier_call = acpi_ac_battery_notify;
> register_acpi_notifier(&ac->battery_nb);
> end:
> - if (result)
> - kfree(ac);
> -
> dmi_check_system(ac_dmi_table);
> return result;
> }
> @@ -287,8 +284,6 @@ static int acpi_ac_remove(struct platform_device *pdev)
> power_supply_unregister(&ac->charger);
> unregister_acpi_notifier(&ac->battery_nb);
>
> - kfree(ac);
> -
> return 0;
> }
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best regards
Tianyu Lan
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
