Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] input: convert kcalloc to kzalloc

Browse Source 
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:
Pekka Enberg 2005-09-06 15:18:33 -07:00 committed by Linus Torvalds
parent 874ca6cd3f
commit a97e148a8b
20 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/gameport/emu10k1-gp.c
View File

@ -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")) if (!request_region(ioport, iolen, "emu10k1-gp"))
return -EBUSY; return -EBUSY;
emu = kcalloc(1, sizeof(struct emu), GFP_KERNEL); emu = kzalloc(sizeof(struct emu), GFP_KERNEL);
port = gameport_allocate_port(); port = gameport_allocate_port();
if (!emu || !port) { if (!emu || !port) {
printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n"); printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");

2
drivers/input/gameport/fm801-gp.c
View File

@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
struct fm801_gp *gp; struct fm801_gp *gp;
struct gameport *port; struct gameport *port;
gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL); gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);
port = gameport_allocate_port(); port = gameport_allocate_port();
if (!gp || !port) { if (!gp || !port) {
printk(KERN_ERR "fm801-gp: Memory allocation failed\n"); printk(KERN_ERR "fm801-gp: Memory allocation failed\n");

4
drivers/input/gameport/ns558.c
View File

@ -142,7 +142,7 @@ static int ns558_isa_probe(int io)
return -EBUSY; return -EBUSY;
} }
ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL); ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
port = gameport_allocate_port(); port = gameport_allocate_port();
if (!ns558 || !port) { if (!ns558 || !port) {
printk(KERN_ERR "ns558: Memory allocation failed.\n"); 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")) if (!request_region(ioport, iolen, "ns558-pnp"))
return -EBUSY; return -EBUSY;
ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL); ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
port = gameport_allocate_port(); port = gameport_allocate_port();
if (!ns558 || !port) { if (!ns558 || !port) {
printk(KERN_ERR "ns558: Memory allocation failed\n"); printk(KERN_ERR "ns558: Memory allocation failed\n");

2
drivers/input/joystick/a3d.c
View File

@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
int i; int i;
int err; int err;
if (!(a3d = kcalloc(1, sizeof(struct a3d), GFP_KERNEL))) if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
a3d->gameport = gameport; a3d->gameport = gameport;

2
drivers/input/joystick/adi.c
View File

@ -469,7 +469,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
int i; int i;
int err; int err;
if (!(port = kcalloc(1, sizeof(struct adi_port), GFP_KERNEL))) if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
port->gameport = gameport; port->gameport = gameport;

2
drivers/input/joystick/analog.c
View File

@ -655,7 +655,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
int i; int i;
int err; int err;
if (!(port = kcalloc(1, sizeof(struct analog_port), GFP_KERNEL))) if (!(port = kzalloc(sizeof(struct analog_port), GFP_KERNEL)))
return - ENOMEM; return - ENOMEM;
err = analog_init_port(gameport, drv, port); err = analog_init_port(gameport, drv, port);

2
drivers/input/joystick/cobra.c
View File

@ -163,7 +163,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
int i, j; int i, j;
int err; int err;
if (!(cobra = kcalloc(1, sizeof(struct cobra), GFP_KERNEL))) if (!(cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
cobra->gameport = gameport; cobra->gameport = gameport;

2
drivers/input/joystick/db9.c
View File

@ -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); parport_put_port(pp);
return NULL; return NULL;
} }

2
drivers/input/joystick/gamecon.c
View File

@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs)
return NULL; return NULL;
} }
if (!(gc = kcalloc(1, sizeof(struct gc), GFP_KERNEL))) { if (!(gc = kzalloc(sizeof(struct gc), GFP_KERNEL))) {
parport_put_port(pp); parport_put_port(pp);
return NULL; return NULL;
} }

2
drivers/input/joystick/gf2k.c
View File

@ -242,7 +242,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
unsigned char data[GF2K_LENGTH]; unsigned char data[GF2K_LENGTH];
int i, err; int i, err;
if (!(gf2k = kcalloc(1, sizeof(struct gf2k), GFP_KERNEL))) if (!(gf2k = kzalloc(sizeof(struct gf2k), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
gf2k->gameport = gameport; gf2k->gameport = gameport;

2
drivers/input/joystick/grip.c
View File

@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
int i, j, t; int i, j, t;
int err; int err;
if (!(grip = kcalloc(1, sizeof(struct grip), GFP_KERNEL))) if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
grip->gameport = gameport; grip->gameport = gameport;

2
drivers/input/joystick/grip_mp.c
View File

@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
struct grip_mp *grip; struct grip_mp *grip;
int err; int err;
if (!(grip = kcalloc(1, sizeof(struct grip_mp), GFP_KERNEL))) if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
grip->gameport = gameport; grip->gameport = gameport;

2
drivers/input/joystick/guillemot.c
View File

@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
int i, t; int i, t;
int err; int err;
if (!(guillemot = kcalloc(1, sizeof(struct guillemot), GFP_KERNEL))) if (!(guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
guillemot->gameport = gameport; guillemot->gameport = gameport;

2
drivers/input/joystick/interact.c
View File

@ -212,7 +212,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
int i, t; int i, t;
int err; int err;
if (!(interact = kcalloc(1, sizeof(struct interact), GFP_KERNEL))) if (!(interact = kzalloc(sizeof(struct interact), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
interact->gameport = gameport; interact->gameport = gameport;

2
drivers/input/joystick/sidewinder.c
View File

@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
comment[0] = 0; comment[0] = 0;
sw = kcalloc(1, sizeof(struct sw), GFP_KERNEL); sw = kzalloc(sizeof(struct sw), GFP_KERNEL);
buf = kmalloc(SW_LENGTH, GFP_KERNEL); buf = kmalloc(SW_LENGTH, GFP_KERNEL);
idbuf = kmalloc(SW_LENGTH, GFP_KERNEL); idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
if (!sw || !buf || !idbuf) { if (!sw || !buf || !idbuf) {

2
drivers/input/joystick/tmdc.c
View File

@ -262,7 +262,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
int i, j, k, l, m; int i, j, k, l, m;
int err; int err;
if (!(tmdc = kcalloc(1, sizeof(struct tmdc), GFP_KERNEL))) if (!(tmdc = kzalloc(sizeof(struct tmdc), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
tmdc->gameport = gameport; tmdc->gameport = gameport;

2
drivers/input/joystick/turbografx.c
View File

@ -178,7 +178,7 @@ static struct tgfx __init *tgfx_probe(int *config, int nargs)
return NULL; return NULL;
} }
if (!(tgfx = kcalloc(1, sizeof(struct tgfx), GFP_KERNEL))) { if (!(tgfx = kzalloc(sizeof(struct tgfx), GFP_KERNEL))) {
parport_put_port(pp); parport_put_port(pp);
return NULL; return NULL;
} }

2
drivers/input/keyboard/corgikbd.c
View File

@ -260,7 +260,7 @@ static int __init corgikbd_probe(struct device *dev)
int i; int i;
struct corgikbd *corgikbd; struct corgikbd *corgikbd;
corgikbd = kcalloc(1, sizeof(struct corgikbd), GFP_KERNEL); corgikbd = kzalloc(sizeof(struct corgikbd), GFP_KERNEL);
if (!corgikbd) if (!corgikbd)
return -ENOMEM; return -ENOMEM;

2
drivers/input/mouse/psmouse-base.c
View File

@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
psmouse_deactivate(parent); psmouse_deactivate(parent);
} }
if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) { if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) {
retval = -ENOMEM; retval = -ENOMEM;
goto out; goto out;
} }

4
drivers/input/serio/serport.c
View File

@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty)
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL); serport = kzalloc(sizeof(struct serport), GFP_KERNEL);
if (!serport) if (!serport)
return -ENOMEM; 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)) if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
return -EBUSY; return -EBUSY;
serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL); serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
if (!serio) if (!serio)
return -ENOMEM; return -ENOMEM;