[PATCH] input: 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> Cc: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
874ca6cd3f
commit
a97e148a8b
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -655,7 +655,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
|
|||
int i;
|
||||
int err;
|
||||
|
||||
if (!(port = kcalloc(1, sizeof(struct analog_port), GFP_KERNEL)))
|
||||
if (!(port = kzalloc(sizeof(struct analog_port), GFP_KERNEL)))
|
||||
return - ENOMEM;
|
||||
|
||||
err = analog_init_port(gameport, drv, port);
|
||||
|
|
|
@ -163,7 +163,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
int i, j;
|
||||
int err;
|
||||
|
||||
if (!(cobra = kcalloc(1, sizeof(struct cobra), GFP_KERNEL)))
|
||||
if (!(cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
cobra->gameport = gameport;
|
||||
|
|
|
@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs)
|
|||
}
|
||||
}
|
||||
|
||||
if (!(db9 = kcalloc(1, sizeof(struct db9), GFP_KERNEL))) {
|
||||
if (!(db9 = kzalloc(sizeof(struct db9), GFP_KERNEL))) {
|
||||
parport_put_port(pp);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!(gc = kcalloc(1, sizeof(struct gc), GFP_KERNEL))) {
|
||||
if (!(gc = kzalloc(sizeof(struct gc), GFP_KERNEL))) {
|
||||
parport_put_port(pp);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -242,7 +242,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
unsigned char data[GF2K_LENGTH];
|
||||
int i, err;
|
||||
|
||||
if (!(gf2k = kcalloc(1, sizeof(struct gf2k), GFP_KERNEL)))
|
||||
if (!(gf2k = kzalloc(sizeof(struct gf2k), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
gf2k->gameport = gameport;
|
||||
|
|
|
@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
int i, j, t;
|
||||
int err;
|
||||
|
||||
if (!(grip = kcalloc(1, sizeof(struct grip), GFP_KERNEL)))
|
||||
if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
grip->gameport = gameport;
|
||||
|
|
|
@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
struct grip_mp *grip;
|
||||
int err;
|
||||
|
||||
if (!(grip = kcalloc(1, sizeof(struct grip_mp), GFP_KERNEL)))
|
||||
if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
grip->gameport = gameport;
|
||||
|
|
|
@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
|
|||
int i, t;
|
||||
int err;
|
||||
|
||||
if (!(guillemot = kcalloc(1, sizeof(struct guillemot), GFP_KERNEL)))
|
||||
if (!(guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
guillemot->gameport = gameport;
|
||||
|
|
|
@ -212,7 +212,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
|
|||
int i, t;
|
||||
int err;
|
||||
|
||||
if (!(interact = kcalloc(1, sizeof(struct interact), GFP_KERNEL)))
|
||||
if (!(interact = kzalloc(sizeof(struct interact), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
interact->gameport = gameport;
|
||||
|
|
|
@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
|
||||
comment[0] = 0;
|
||||
|
||||
sw = kcalloc(1, sizeof(struct sw), GFP_KERNEL);
|
||||
sw = kzalloc(sizeof(struct sw), GFP_KERNEL);
|
||||
buf = kmalloc(SW_LENGTH, GFP_KERNEL);
|
||||
idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
|
||||
if (!sw || !buf || !idbuf) {
|
||||
|
|
|
@ -262,7 +262,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
|
|||
int i, j, k, l, m;
|
||||
int err;
|
||||
|
||||
if (!(tmdc = kcalloc(1, sizeof(struct tmdc), GFP_KERNEL)))
|
||||
if (!(tmdc = kzalloc(sizeof(struct tmdc), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
tmdc->gameport = gameport;
|
||||
|
|
|
@ -178,7 +178,7 @@ static struct tgfx __init *tgfx_probe(int *config, int nargs)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!(tgfx = kcalloc(1, sizeof(struct tgfx), GFP_KERNEL))) {
|
||||
if (!(tgfx = kzalloc(sizeof(struct tgfx), GFP_KERNEL))) {
|
||||
parport_put_port(pp);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -260,7 +260,7 @@ static int __init corgikbd_probe(struct device *dev)
|
|||
int i;
|
||||
struct corgikbd *corgikbd;
|
||||
|
||||
corgikbd = kcalloc(1, sizeof(struct corgikbd), GFP_KERNEL);
|
||||
corgikbd = kzalloc(sizeof(struct corgikbd), GFP_KERNEL);
|
||||
if (!corgikbd)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
|
|||
psmouse_deactivate(parent);
|
||||
}
|
||||
|
||||
if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) {
|
||||
if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) {
|
||||
retval = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty)
|
|||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
|
||||
serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL);
|
||||
serport = kzalloc(sizeof(struct serport), GFP_KERNEL);
|
||||
if (!serport)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -165,7 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
|
|||
if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
|
||||
return -EBUSY;
|
||||
|
||||
serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
|
||||
serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
|
||||
if (!serio)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
Loading…
Reference in New Issue