aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorYoann Padioleau <padator@wanadoo.fr>2007-07-19 04:49:03 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:50 -0400
commitdd00cc486ab1c17049a535413d1751ef3482141c (patch)
treed90ff69ea06792b9284f2f2665c96624f121b88a /drivers/w1
parent3b5ad0797c0e4049001f961a8b58f1d0ce532072 (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/w1')
-rw-r--r--drivers/w1/masters/matrox_w1.c3
-rw-r--r--drivers/w1/slaves/w1_ds2433.c3
-rw-r--r--drivers/w1/w1.c3
-rw-r--r--drivers/w1/w1_int.c3
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 6f9d880ab2e9..d356da5709fc 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -164,7 +164,7 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
164 if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400) 164 if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)
165 return -ENODEV; 165 return -ENODEV;
166 166
167 dev = kmalloc(sizeof(struct matrox_device) + 167 dev = kzalloc(sizeof(struct matrox_device) +
168 sizeof(struct w1_bus_master), GFP_KERNEL); 168 sizeof(struct w1_bus_master), GFP_KERNEL);
169 if (!dev) { 169 if (!dev) {
170 dev_err(&pdev->dev, 170 dev_err(&pdev->dev,
@@ -173,7 +173,6 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
173 return -ENOMEM; 173 return -ENOMEM;
174 } 174 }
175 175
176 memset(dev, 0, sizeof(struct matrox_device) + sizeof(struct w1_bus_master));
177 176
178 dev->bus_master = (struct w1_bus_master *)(dev + 1); 177 dev->bus_master = (struct w1_bus_master *)(dev + 1);
179 178
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c
index cab56005dd49..858c16a544c2 100644
--- a/drivers/w1/slaves/w1_ds2433.c
+++ b/drivers/w1/slaves/w1_ds2433.c
@@ -266,10 +266,9 @@ static int w1_f23_add_slave(struct w1_slave *sl)
266#ifdef CONFIG_W1_SLAVE_DS2433_CRC 266#ifdef CONFIG_W1_SLAVE_DS2433_CRC
267 struct w1_f23_data *data; 267 struct w1_f23_data *data;
268 268
269 data = kmalloc(sizeof(struct w1_f23_data), GFP_KERNEL); 269 data = kzalloc(sizeof(struct w1_f23_data), GFP_KERNEL);
270 if (!data) 270 if (!data)
271 return -ENOMEM; 271 return -ENOMEM;
272 memset(data, 0, sizeof(struct w1_f23_data));
273 sl->family_data = data; 272 sl->family_data = data;
274 273
275#endif /* CONFIG_W1_SLAVE_DS2433_CRC */ 274#endif /* CONFIG_W1_SLAVE_DS2433_CRC */
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index c6332108f1c5..8d7ab74170d5 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -520,7 +520,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
520 int err; 520 int err;
521 struct w1_netlink_msg msg; 521 struct w1_netlink_msg msg;
522 522
523 sl = kmalloc(sizeof(struct w1_slave), GFP_KERNEL); 523 sl = kzalloc(sizeof(struct w1_slave), GFP_KERNEL);
524 if (!sl) { 524 if (!sl) {
525 dev_err(&dev->dev, 525 dev_err(&dev->dev,
526 "%s: failed to allocate new slave device.\n", 526 "%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)
528 return -ENOMEM; 528 return -ENOMEM;
529 } 529 }
530 530
531 memset(sl, 0, sizeof(*sl));
532 531
533 sl->owner = THIS_MODULE; 532 sl->owner = THIS_MODULE;
534 sl->master = dev; 533 sl->master = dev;
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 258defdb2efd..2fbd8dd16df5 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -41,7 +41,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
41 /* 41 /*
42 * We are in process context(kernel thread), so can sleep. 42 * We are in process context(kernel thread), so can sleep.
43 */ 43 */
44 dev = kmalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); 44 dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
45 if (!dev) { 45 if (!dev) {
46 printk(KERN_ERR 46 printk(KERN_ERR
47 "Failed to allocate %zd bytes for new w1 device.\n", 47 "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,
49 return NULL; 49 return NULL;
50 } 50 }
51 51
52 memset(dev, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));
53 52
54 dev->bus_master = (struct w1_bus_master *)(dev + 1); 53 dev->bus_master = (struct w1_bus_master *)(dev + 1);
55 54