summaryrefslogtreecommitdiff
path: root/arch/arm/common/sa1111.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-06 17:29:26 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2016-09-20 16:21:07 +0300
commit7d53c1f01210aa79838f1fe34b2a89f8e900d720 (patch)
tree4ff9964f60a454841d043557a6f4051c42c816cf /arch/arm/common/sa1111.c
parenteac8dbf74f30479b70b9a53f3b24285bd6229d09 (diff)
downloadlinux-7d53c1f01210aa79838f1fe34b2a89f8e900d720.tar.xz
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>
Diffstat (limited to 'arch/arm/common/sa1111.c')
-rw-r--r--arch/arm/common/sa1111.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 303c62861d84..f2ce21c03646 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -696,7 +696,7 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
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 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
err_clkput:
clk_put(sachip->clk);
err_free:
- kfree(sachip);
return ret;
}
@@ -847,7 +846,6 @@ static void __sa1111_remove(struct sa1111 *sachip)
iounmap(sachip->base);
clk_put(sachip->clk);
- kfree(sachip);
}
struct sa1111_save_data {