mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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) [[email protected]: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Acked-by: Russell King <[email protected]> Cc: Bryan Wu <[email protected]> Acked-by: Jiri Slaby <[email protected]> Cc: Dave Airlie <[email protected]> Acked-by: Roland Dreier <[email protected]> Cc: Jiri Kosina <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Pierre Ossman <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: "David S. Miller" <[email protected]> Acked-by: Greg KH <[email protected]> Cc: James Bottomley <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
3b5ad0797c
commit
dd00cc486a
136 changed files with 157 additions and 330 deletions
|
|
@ -164,7 +164,7 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
|
|||
if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
|
||||
return -ENODEV;
|
||||
|
||||
dev = kmalloc(sizeof(struct matrox_device) +
|
||||
dev = kzalloc(sizeof(struct matrox_device) +
|
||||
sizeof(struct w1_bus_master), GFP_KERNEL);
|
||||
if (!dev) {
|
||||
dev_err(&pdev->dev,
|
||||
|
|
@ -173,7 +173,6 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memset(dev, 0, sizeof(struct matrox_device) + sizeof(struct w1_bus_master));
|
||||
|
||||
dev->bus_master = (struct w1_bus_master *)(dev + 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -266,10 +266,9 @@ static int w1_f23_add_slave(struct w1_slave *sl)
|
|||
#ifdef CONFIG_W1_SLAVE_DS2433_CRC
|
||||
struct w1_f23_data *data;
|
||||
|
||||
data = kmalloc(sizeof(struct w1_f23_data), GFP_KERNEL);
|
||||
data = kzalloc(sizeof(struct w1_f23_data), GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
memset(data, 0, sizeof(struct w1_f23_data));
|
||||
sl->family_data = data;
|
||||
|
||||
#endif /* CONFIG_W1_SLAVE_DS2433_CRC */
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
|
|||
int err;
|
||||
struct w1_netlink_msg msg;
|
||||
|
||||
sl = kmalloc(sizeof(struct w1_slave), GFP_KERNEL);
|
||||
sl = kzalloc(sizeof(struct w1_slave), GFP_KERNEL);
|
||||
if (!sl) {
|
||||
dev_err(&dev->dev,
|
||||
"%s: failed to allocate new slave device.\n",
|
||||
|
|
@ -528,7 +528,6 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memset(sl, 0, sizeof(*sl));
|
||||
|
||||
sl->owner = THIS_MODULE;
|
||||
sl->master = dev;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
|
|||
/*
|
||||
* We are in process context(kernel thread), so can sleep.
|
||||
*/
|
||||
dev = kmalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
|
||||
dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
|
||||
if (!dev) {
|
||||
printk(KERN_ERR
|
||||
"Failed to allocate %zd bytes for new w1 device.\n",
|
||||
|
|
@ -49,7 +49,6 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
memset(dev, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
|
||||
|
||||
dev->bus_master = (struct w1_bus_master *)(dev + 1);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue