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/rapidio/rio-scan.c | |
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/rapidio/rio-scan.c')
-rw-r--r-- | drivers/rapidio/rio-scan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index f935c1f71a58..44420723a359 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c | |||
@@ -297,11 +297,10 @@ static struct rio_dev *rio_setup_device(struct rio_net *net, | |||
297 | struct rio_switch *rswitch; | 297 | struct rio_switch *rswitch; |
298 | int result, rdid; | 298 | int result, rdid; |
299 | 299 | ||
300 | rdev = kmalloc(sizeof(struct rio_dev), GFP_KERNEL); | 300 | rdev = kzalloc(sizeof(struct rio_dev), GFP_KERNEL); |
301 | if (!rdev) | 301 | if (!rdev) |
302 | goto out; | 302 | goto out; |
303 | 303 | ||
304 | memset(rdev, 0, sizeof(struct rio_dev)); | ||
305 | rdev->net = net; | 304 | rdev->net = net; |
306 | rio_mport_read_config_32(port, destid, hopcount, RIO_DEV_ID_CAR, | 305 | rio_mport_read_config_32(port, destid, hopcount, RIO_DEV_ID_CAR, |
307 | &result); | 306 | &result); |
@@ -801,9 +800,8 @@ static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port) | |||
801 | { | 800 | { |
802 | struct rio_net *net; | 801 | struct rio_net *net; |
803 | 802 | ||
804 | net = kmalloc(sizeof(struct rio_net), GFP_KERNEL); | 803 | net = kzalloc(sizeof(struct rio_net), GFP_KERNEL); |
805 | if (net) { | 804 | if (net) { |
806 | memset(net, 0, sizeof(struct rio_net)); | ||
807 | INIT_LIST_HEAD(&net->node); | 805 | INIT_LIST_HEAD(&net->node); |
808 | INIT_LIST_HEAD(&net->devices); | 806 | INIT_LIST_HEAD(&net->devices); |
809 | INIT_LIST_HEAD(&net->mports); | 807 | INIT_LIST_HEAD(&net->mports); |