[PATCH 01/13] power: reset: ltc2952: prefer devm_kzalloc over kzalloc

From: Frans Klaver
Date: Wed Oct 22 2014 - 10:31:35 EST


Make use of the fact that the allocated resources can be automatically
deallocated. This reduces cleanup code and chance of leaks.

Signed-off-by: Frans Klaver <frans.klaver@xxxxxxxxx>
---
drivers/power/reset/ltc2952-poweroff.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 116a1ce..951a90d 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -292,7 +292,8 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev)
return -EBUSY;
}

- ltc2952_data = kzalloc(sizeof(*ltc2952_data), GFP_KERNEL);
+ ltc2952_data = devm_kzalloc(&pdev->dev, sizeof(*ltc2952_data),
+ GFP_KERNEL);
if (!ltc2952_data)
return -ENOMEM;

@@ -300,17 +301,13 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev)

ret = ltc2952_poweroff_init(pdev);
if (ret)
- goto err;
+ return ret;

pm_power_off = &ltc2952_poweroff_kill;

dev_info(&pdev->dev, "probe successful\n");

return 0;
-
-err:
- kfree(ltc2952_data);
- return ret;
}

static int ltc2952_poweroff_remove(struct platform_device *pdev)
@@ -324,8 +321,6 @@ static int ltc2952_poweroff_remove(struct platform_device *pdev)

for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++)
gpiod_put(ltc2952_data->gpio[i]);
-
- kfree(ltc2952_data);
}

return 0;
--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/