[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:

committed by
Linus Torvalds

parent
874ca6cd3f
commit
a97e148a8b
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user