diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-13 16:03:15 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-13 16:23:06 -0400 |
commit | 2bfefa4c9632fb09bfe3277cf7b690818b147654 (patch) | |
tree | 9ddbd55e57e266dfea47e38fa007f47731fed8fb /drivers/mtd/maps | |
parent | ecce2a6f9bdc7635838baeff8a09a76c9a70e7e0 (diff) |
drivers/mtd: Use kzalloc
Use kzalloc rather than the combination of kmalloc and memset.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,size,flags;
statement S;
@@
-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
if (x == NULL) S
-memset(x, 0, size);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r-- | drivers/mtd/maps/ixp2000.c | 3 | ||||
-rw-r--r-- | drivers/mtd/maps/ixp4xx.c | 3 | ||||
-rw-r--r-- | drivers/mtd/maps/pxa2xx-flash.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index 1bdf0ee6d0b6..9639d83a9d6c 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c | |||
@@ -165,12 +165,11 @@ static int ixp2000_flash_probe(struct platform_device *dev) | |||
165 | return -EIO; | 165 | return -EIO; |
166 | } | 166 | } |
167 | 167 | ||
168 | info = kmalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL); | 168 | info = kzalloc(sizeof(struct ixp2000_flash_info), GFP_KERNEL); |
169 | if(!info) { | 169 | if(!info) { |
170 | err = -ENOMEM; | 170 | err = -ENOMEM; |
171 | goto Error; | 171 | goto Error; |
172 | } | 172 | } |
173 | memset(info, 0, sizeof(struct ixp2000_flash_info)); | ||
174 | 173 | ||
175 | platform_set_drvdata(dev, info); | 174 | platform_set_drvdata(dev, info); |
176 | 175 | ||
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index 7513d90fee6f..e0a5e0426ead 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c | |||
@@ -196,12 +196,11 @@ static int ixp4xx_flash_probe(struct platform_device *dev) | |||
196 | return err; | 196 | return err; |
197 | } | 197 | } |
198 | 198 | ||
199 | info = kmalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL); | 199 | info = kzalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL); |
200 | if(!info) { | 200 | if(!info) { |
201 | err = -ENOMEM; | 201 | err = -ENOMEM; |
202 | goto Error; | 202 | goto Error; |
203 | } | 203 | } |
204 | memset(info, 0, sizeof(struct ixp4xx_flash_info)); | ||
205 | 204 | ||
206 | platform_set_drvdata(dev, info); | 205 | platform_set_drvdata(dev, info); |
207 | 206 | ||
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 91dc6331053f..dd90880048cf 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c | |||
@@ -63,11 +63,10 @@ static int __init pxa2xx_flash_probe(struct platform_device *pdev) | |||
63 | if (!res) | 63 | if (!res) |
64 | return -ENODEV; | 64 | return -ENODEV; |
65 | 65 | ||
66 | info = kmalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL); | 66 | info = kzalloc(sizeof(struct pxa2xx_flash_info), GFP_KERNEL); |
67 | if (!info) | 67 | if (!info) |
68 | return -ENOMEM; | 68 | return -ENOMEM; |
69 | 69 | ||
70 | memset(info, 0, sizeof(struct pxa2xx_flash_info)); | ||
71 | info->map.name = (char *) flash->name; | 70 | info->map.name = (char *) flash->name; |
72 | info->map.bankwidth = flash->width; | 71 | info->map.bankwidth = flash->width; |
73 | info->map.phys = res->start; | 72 | info->map.phys = res->start; |