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

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

[PATCH] input: 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>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 874ca6cd

drivers/input/gameport/emu10k1-gp.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id 
	if (!request_region(ioport, iolen, "emu10k1-gp"))

		return -EBUSY;



	emu = kcalloc(1, sizeof(struct emu), GFP_KERNEL);

	emu = kzalloc(sizeof(struct emu), GFP_KERNEL);

	port = gameport_allocate_port();

	if (!emu || !port) {

		printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");

drivers/input/gameport/fm801-gp.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device 
	struct fm801_gp *gp;

	struct gameport *port;



	gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL);

	gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);

	port = gameport_allocate_port();

	if (!gp || !port) {

		printk(KERN_ERR "fm801-gp: Memory allocation failed\n");

drivers/input/gameport/ns558.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int ns558_isa_probe(int io) 
			return -EBUSY;

	}



	ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);

	ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);

	port = gameport_allocate_port();

	if (!ns558 || !port) {

		printk(KERN_ERR "ns558: Memory allocation failed.\n");
@@ -215,7 +215,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did) 
	if (!request_region(ioport, iolen, "ns558-pnp"))

		return -EBUSY;



	ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);

	ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);

	port = gameport_allocate_port();

	if (!ns558 || !port) {

		printk(KERN_ERR "ns558: Memory allocation failed\n");

drivers/input/joystick/a3d.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) 
	int i;

	int err;



	if (!(a3d = kcalloc(1, sizeof(struct a3d), GFP_KERNEL)))

	if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL)))

		return -ENOMEM;



	a3d->gameport = gameport;

drivers/input/joystick/adi.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv) 
	int i;

	int err;



	if (!(port = kcalloc(1, sizeof(struct adi_port), GFP_KERNEL)))

	if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))

		return -ENOMEM;



	port->gameport = gameport;