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/sbus | |
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/sbus')
-rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 3 | ||||
-rw-r--r-- | drivers/sbus/char/vfc_dev.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 178155bf9db6..fbadd4d761f3 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c | |||
@@ -156,10 +156,9 @@ struct bbc_i2c_client *bbc_i2c_attach(struct linux_ebus_child *echild) | |||
156 | 156 | ||
157 | if (!bp) | 157 | if (!bp) |
158 | return NULL; | 158 | return NULL; |
159 | client = kmalloc(sizeof(*client), GFP_KERNEL); | 159 | client = kzalloc(sizeof(*client), GFP_KERNEL); |
160 | if (!client) | 160 | if (!client) |
161 | return NULL; | 161 | return NULL; |
162 | memset(client, 0, sizeof(*client)); | ||
163 | client->bp = bp; | 162 | client->bp = bp; |
164 | client->echild = echild; | 163 | client->echild = echild; |
165 | client->bus = echild->resource[0].start; | 164 | client->bus = echild->resource[0].start; |
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 6afc7e5df0d4..26b1d2a17ed2 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c | |||
@@ -656,12 +656,9 @@ static int vfc_probe(void) | |||
656 | if (!cards) | 656 | if (!cards) |
657 | return -ENODEV; | 657 | return -ENODEV; |
658 | 658 | ||
659 | vfc_dev_lst = kmalloc(sizeof(struct vfc_dev *) * | 659 | vfc_dev_lst = kcalloc(cards + 1, sizeof(struct vfc_dev*), GFP_KERNEL); |
660 | (cards+1), | ||
661 | GFP_KERNEL); | ||
662 | if (vfc_dev_lst == NULL) | 660 | if (vfc_dev_lst == NULL) |
663 | return -ENOMEM; | 661 | return -ENOMEM; |
664 | memset(vfc_dev_lst, 0, sizeof(struct vfc_dev *) * (cards + 1)); | ||
665 | vfc_dev_lst[cards] = NULL; | 662 | vfc_dev_lst[cards] = NULL; |
666 | 663 | ||
667 | ret = register_chrdev(VFC_MAJOR, vfcstr, &vfc_fops); | 664 | ret = register_chrdev(VFC_MAJOR, vfcstr, &vfc_fops); |