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>
This commit is contained in:
committed by
Linus Torvalds
parent
3b5ad0797c
commit
dd00cc486a
@@ -453,8 +453,8 @@ static int __init setup_adapter(int card_base, int type, int n)
|
||||
int scc_base = card_base + hw[type].scc_offset;
|
||||
char *chipnames[] = CHIPNAMES;
|
||||
|
||||
/* Allocate memory */
|
||||
info = kmalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
|
||||
/* Initialize what is necessary for write_scc and write_scc_data */
|
||||
info = kzalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
|
||||
if (!info) {
|
||||
printk(KERN_ERR "dmascc: "
|
||||
"could not allocate memory for %s at %#3x\n",
|
||||
@@ -462,8 +462,6 @@ static int __init setup_adapter(int card_base, int type, int n)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Initialize what is necessary for write_scc and write_scc_data */
|
||||
memset(info, 0, sizeof(struct scc_info));
|
||||
|
||||
info->dev[0] = alloc_netdev(0, "", dev_setup);
|
||||
if (!info->dev[0]) {
|
||||
|
Reference in New Issue
Block a user