Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82ca76b6 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] drivers: convert kcalloc to kzalloc 



This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7b842b6e

drivers/block/aoe/aoedev.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes) 
	struct aoedev *d;

	struct frame *f, *e;



	d = kcalloc(1, sizeof *d, GFP_ATOMIC);

	d = kzalloc(sizeof *d, GFP_ATOMIC);

	if (d == NULL)

		return NULL;

	f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);

drivers/char/mbcs.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id) 


	dev->soft = NULL;



	soft = kcalloc(1, sizeof(struct mbcs_soft), GFP_KERNEL);

	soft = kzalloc(sizeof(struct mbcs_soft), GFP_KERNEL);

	if (soft == NULL)

		return -ENOMEM;

drivers/i2c/chips/isp1301_omap.c

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind) 
	if (the_transceiver)

		return 0;



	isp = kcalloc(1, sizeof *isp, GFP_KERNEL);

	isp = kzalloc(sizeof *isp, GFP_KERNEL);

	if (!isp)

		return 0;

drivers/infiniband/core/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *, 
		return NULL;



	for (i = 0; i < len; i++) {

		element = kcalloc(1, sizeof(struct port_table_attribute),

		element = kzalloc(sizeof(struct port_table_attribute),

				  GFP_KERNEL);

		if (!element)

			goto err;

drivers/scsi/sata_qstor.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int qs_port_start(struct ata_port *ap) 
	if (rc)

		return rc;

	qs_enter_reg_mode(ap);

	pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);

	pp = kzalloc(sizeof(*pp), GFP_KERNEL);

	if (!pp) {

		rc = -ENOMEM;

		goto err_out;