diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2006-12-13 03:34:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:52 -0500 |
commit | cd86128088554d64fea1679191509f00e6353c5b (patch) | |
tree | a828960f4bd44ef1682d88618e58c6ccd2367bc1 /drivers/ata/pdc_adma.c | |
parent | 90aef12e6dd609e1ad7fb70044eedc78ca55ee5e (diff) |
[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()
All kcalloc() calls of the form "kcalloc(1,...)" are converted to the
equivalent kzalloc() calls, and a few kcalloc() calls with the incorrect
ordering of the first two arguments are fixed.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ata/pdc_adma.c')
-rw-r--r-- | drivers/ata/pdc_adma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 9021e34d2096..90786d7a20bb 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
@@ -551,7 +551,7 @@ static int adma_port_start(struct ata_port *ap) | |||
551 | return rc; | 551 | return rc; |
552 | adma_enter_reg_mode(ap); | 552 | adma_enter_reg_mode(ap); |
553 | rc = -ENOMEM; | 553 | rc = -ENOMEM; |
554 | pp = kcalloc(1, sizeof(*pp), GFP_KERNEL); | 554 | pp = kzalloc(sizeof(*pp), GFP_KERNEL); |
555 | if (!pp) | 555 | if (!pp) |
556 | goto err_out; | 556 | goto err_out; |
557 | pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma, | 557 | pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma, |
@@ -672,7 +672,7 @@ static int adma_ata_init_one(struct pci_dev *pdev, | |||
672 | if (rc) | 672 | if (rc) |
673 | goto err_out_iounmap; | 673 | goto err_out_iounmap; |
674 | 674 | ||
675 | probe_ent = kcalloc(1, sizeof(*probe_ent), GFP_KERNEL); | 675 | probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL); |
676 | if (probe_ent == NULL) { | 676 | if (probe_ent == NULL) { |
677 | rc = -ENOMEM; | 677 | rc = -ENOMEM; |
678 | goto err_out_iounmap; | 678 | goto err_out_iounmap; |