ARM: sa1111: use devm_kzalloc()
Use devm_kzalloc() to allocate our driver data, so we can eliminate its
kfree() from the device removal and error cleanup paths.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 303c628..f2ce21c 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -696,7 +696,7 @@
if (!pd)
return -EINVAL;
- sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL);
+ sachip = devm_kzalloc(me, sizeof(struct sa1111), GFP_KERNEL);
if (!sachip)
return -ENOMEM;
@@ -808,7 +808,6 @@
err_clkput:
clk_put(sachip->clk);
err_free:
- kfree(sachip);
return ret;
}
@@ -847,7 +846,6 @@
iounmap(sachip->base);
clk_put(sachip->clk);
- kfree(sachip);
}
struct sa1111_save_data {