diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-06 18:18:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:46 -0400 |
commit | 82ca76b6b160b6fce46f78c069f87fe1a4dc0778 (patch) | |
tree | 7e33c8a33970971317f0b1b1eb715dd884beffc1 | |
parent | 7b842b6e3704f4b9606ff8a4ffe03579d9addf5e (diff) |
[PATCH] drivers: convert kcalloc to kzalloc
This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/block/aoe/aoedev.c | 2 | ||||
-rw-r--r-- | drivers/char/mbcs.c | 2 | ||||
-rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/core/sysfs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/sata_qstor.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c index 6e231c5a1199..ded33ba31acc 100644 --- a/drivers/block/aoe/aoedev.c +++ b/drivers/block/aoe/aoedev.c | |||
@@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes) | |||
35 | struct aoedev *d; | 35 | struct aoedev *d; |
36 | struct frame *f, *e; | 36 | struct frame *f, *e; |
37 | 37 | ||
38 | d = kcalloc(1, sizeof *d, GFP_ATOMIC); | 38 | d = kzalloc(sizeof *d, GFP_ATOMIC); |
39 | if (d == NULL) | 39 | if (d == NULL) |
40 | return NULL; | 40 | return NULL; |
41 | f = kcalloc(nframes, sizeof *f, GFP_ATOMIC); | 41 | f = kcalloc(nframes, sizeof *f, GFP_ATOMIC); |
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index 115dbb35334b..3fa64c631108 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c | |||
@@ -750,7 +750,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id) | |||
750 | 750 | ||
751 | dev->soft = NULL; | 751 | dev->soft = NULL; |
752 | 752 | ||
753 | soft = kcalloc(1, sizeof(struct mbcs_soft), GFP_KERNEL); | 753 | soft = kzalloc(sizeof(struct mbcs_soft), GFP_KERNEL); |
754 | if (soft == NULL) | 754 | if (soft == NULL) |
755 | return -ENOMEM; | 755 | return -ENOMEM; |
756 | 756 | ||
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 354a26295672..8ee56d4b3891 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
@@ -1489,7 +1489,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind) | |||
1489 | if (the_transceiver) | 1489 | if (the_transceiver) |
1490 | return 0; | 1490 | return 0; |
1491 | 1491 | ||
1492 | isp = kcalloc(1, sizeof *isp, GFP_KERNEL); | 1492 | isp = kzalloc(sizeof *isp, GFP_KERNEL); |
1493 | if (!isp) | 1493 | if (!isp) |
1494 | return 0; | 1494 | return 0; |
1495 | 1495 | ||
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index fae1c2dcee51..211ba3223f65 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c | |||
@@ -463,7 +463,7 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *, | |||
463 | return NULL; | 463 | return NULL; |
464 | 464 | ||
465 | for (i = 0; i < len; i++) { | 465 | for (i = 0; i < len; i++) { |
466 | element = kcalloc(1, sizeof(struct port_table_attribute), | 466 | element = kzalloc(sizeof(struct port_table_attribute), |
467 | GFP_KERNEL); | 467 | GFP_KERNEL); |
468 | if (!element) | 468 | if (!element) |
469 | goto err; | 469 | goto err; |
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c index 029c2482e127..ffcdeb68641c 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/scsi/sata_qstor.c | |||
@@ -494,7 +494,7 @@ static int qs_port_start(struct ata_port *ap) | |||
494 | if (rc) | 494 | if (rc) |
495 | return rc; | 495 | return rc; |
496 | qs_enter_reg_mode(ap); | 496 | qs_enter_reg_mode(ap); |
497 | pp = kcalloc(1, sizeof(*pp), GFP_KERNEL); | 497 | pp = kzalloc(sizeof(*pp), GFP_KERNEL); |
498 | if (!pp) { | 498 | if (!pp) { |
499 | rc = -ENOMEM; | 499 | rc = -ENOMEM; |
500 | goto err_out; | 500 | goto err_out; |