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/parport | |
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/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 3 | ||||
-rw-r--r-- | drivers/parport/parport_serial.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 8b7d84eca05d..802a81d47367 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -105,9 +105,8 @@ static int parport_probe(struct pcmcia_device *link) | |||
105 | DEBUG(0, "parport_attach()\n"); | 105 | DEBUG(0, "parport_attach()\n"); |
106 | 106 | ||
107 | /* Create new parport device */ | 107 | /* Create new parport device */ |
108 | info = kmalloc(sizeof(*info), GFP_KERNEL); | 108 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
109 | if (!info) return -ENOMEM; | 109 | if (!info) return -ENOMEM; |
110 | memset(info, 0, sizeof(*info)); | ||
111 | link->priv = info; | 110 | link->priv = info; |
112 | info->p_dev = link; | 111 | info->p_dev = link; |
113 | 112 | ||
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index 90ea3b8b99b0..bd6ad8b38168 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c | |||
@@ -324,10 +324,9 @@ static int __devinit parport_serial_pci_probe (struct pci_dev *dev, | |||
324 | struct parport_serial_private *priv; | 324 | struct parport_serial_private *priv; |
325 | int err; | 325 | int err; |
326 | 326 | ||
327 | priv = kmalloc (sizeof *priv, GFP_KERNEL); | 327 | priv = kzalloc (sizeof *priv, GFP_KERNEL); |
328 | if (!priv) | 328 | if (!priv) |
329 | return -ENOMEM; | 329 | return -ENOMEM; |
330 | memset(priv, 0, sizeof(struct parport_serial_private)); | ||
331 | pci_set_drvdata (dev, priv); | 330 | pci_set_drvdata (dev, priv); |
332 | 331 | ||
333 | err = pci_enable_device (dev); | 332 | err = pci_enable_device (dev); |