diff options
author | Yoann Padioleau <padator@wanadoo.fr> | 2007-07-19 04:49:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:50 -0400 |
commit | dd00cc486ab1c17049a535413d1751ef3482141c (patch) | |
tree | d90ff69ea06792b9284f2f2665c96624f121b88a /drivers/mfd | |
parent | 3b5ad0797c0e4049001f961a8b58f1d0ce532072 (diff) |
some kmalloc/memset ->kzalloc (tree wide)
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc).
Here is a short excerpt of the semantic patch performing
this transformation:
@@
type T2;
expression x;
identifier f,fld;
expression E;
expression E1,E2;
expression e1,e2,e3,y;
statement S;
@@
x =
- kmalloc
+ kzalloc
(E1,E2)
... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\)
- memset((T2)x,0,E1);
@@
expression E1,E2,E3;
@@
- kzalloc(E1 * E2,E3)
+ kcalloc(E1,E2,E3)
[akpm@linux-foundation.org: get kcalloc args the right way around]
Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <bryan.wu@analog.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Acked-by: Roland Dreier <rolandd@cisco.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Greg KH <greg@kroah.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/mcp-core.c | 3 | ||||
-rw-r--r-- | drivers/mfd/ucb1x00-core.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index 75f401d52fda..b4ed57e02729 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c | |||
@@ -200,9 +200,8 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size) | |||
200 | { | 200 | { |
201 | struct mcp *mcp; | 201 | struct mcp *mcp; |
202 | 202 | ||
203 | mcp = kmalloc(sizeof(struct mcp) + size, GFP_KERNEL); | 203 | mcp = kzalloc(sizeof(struct mcp) + size, GFP_KERNEL); |
204 | if (mcp) { | 204 | if (mcp) { |
205 | memset(mcp, 0, sizeof(struct mcp) + size); | ||
206 | spin_lock_init(&mcp->lock); | 205 | spin_lock_init(&mcp->lock); |
207 | mcp->attached_device.parent = parent; | 206 | mcp->attached_device.parent = parent; |
208 | mcp->attached_device.bus = &mcp_bus_type; | 207 | mcp->attached_device.bus = &mcp_bus_type; |
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 149810a084f5..e03f1bcd4f9f 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
@@ -484,12 +484,11 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
484 | goto err_disable; | 484 | goto err_disable; |
485 | } | 485 | } |
486 | 486 | ||
487 | ucb = kmalloc(sizeof(struct ucb1x00), GFP_KERNEL); | 487 | ucb = kzalloc(sizeof(struct ucb1x00), GFP_KERNEL); |
488 | ret = -ENOMEM; | 488 | ret = -ENOMEM; |
489 | if (!ucb) | 489 | if (!ucb) |
490 | goto err_disable; | 490 | goto err_disable; |
491 | 491 | ||
492 | memset(ucb, 0, sizeof(struct ucb1x00)); | ||
493 | 492 | ||
494 | ucb->cdev.class = &ucb1x00_class; | 493 | ucb->cdev.class = &ucb1x00_class; |
495 | ucb->cdev.dev = &mcp->attached_device; | 494 | ucb->cdev.dev = &mcp->attached_device; |