diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-01-25 09:50:27 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-02-12 11:10:46 -0500 |
commit | eb82038f97f93c5f0ff274fb98a9fff741dc2f5e (patch) | |
tree | a5831ec93daebda35d09c57e4520be590895c730 /drivers/mtd | |
parent | 84cfbbb85a98c8c89407f108da9d102e5dfe2ae5 (diff) |
mtd: physmap_of: Convert device allocation to managed devm_kzalloc()
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/physmap_of.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 263d9e1b8001..500d7f4f8028 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
@@ -68,9 +68,6 @@ static int of_flash_remove(struct platform_device *dev) | |||
68 | kfree(info->list[i].res); | 68 | kfree(info->list[i].res); |
69 | } | 69 | } |
70 | } | 70 | } |
71 | |||
72 | kfree(info); | ||
73 | |||
74 | return 0; | 71 | return 0; |
75 | } | 72 | } |
76 | 73 | ||
@@ -199,8 +196,9 @@ static int of_flash_probe(struct platform_device *dev) | |||
199 | map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access"); | 196 | map_indirect = of_property_read_bool(dp, "no-unaligned-direct-access"); |
200 | 197 | ||
201 | err = -ENOMEM; | 198 | err = -ENOMEM; |
202 | info = kzalloc(sizeof(struct of_flash) + | 199 | info = devm_kzalloc(&dev->dev, |
203 | sizeof(struct of_flash_list) * count, GFP_KERNEL); | 200 | sizeof(struct of_flash) + |
201 | sizeof(struct of_flash_list) * count, GFP_KERNEL); | ||
204 | if (!info) | 202 | if (!info) |
205 | goto err_flash_remove; | 203 | goto err_flash_remove; |
206 | 204 | ||