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

20 files changed, 22 insertions, 22 deletions

diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index a0118038330a..462f8d300aae 100644
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -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");
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 57615bc63906..47e93daa0fa7 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -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");
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 70f051894a3c..d2e55dc956ba 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -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");
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index bf34f75b9467..bf65430181fa 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -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;
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 265962956c63..cf35ae638a0d 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -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;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index c3a5739030c3..64b1313a3c66 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -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);
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index a6002205328f..0b2e9fa26579 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -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;
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index fbd3eed07f90..2a3e4bb2da50 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -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;
         }
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 95bbdd302aad..5427bf9fc862 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -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;
         }
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 7d969420066c..8e4f92b115e6 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -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;
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index d1500d2562d6..9d3f910dd568 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -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;
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 0da7bd133ccf..da17eee6f574 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -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;
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index f93da7bc082d..6a70ec429f06 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -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;
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 9d3f8c38cb09..d7b3472bd686 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -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;
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 47144a7ed9e7..9e0353721a35 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -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) {
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 9eb9954cac6e..7431efc4330e 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -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;
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 28100d461cb7..0c5b9c8297cd 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -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;
         }
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index a8551711e8d6..7719bdfa9eea 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -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;
 
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 2bb2fe78bdca..12bdd3eff923 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -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;
         }
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 79ca38469159..1bd88fca0542 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -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;