提交 a97e148a 编写于 作者: P Pekka Enberg 提交者: Linus Torvalds

[PATCH] input: convert kcalloc to kzalloc

This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.
Signed-off-by: NPekka Enberg <penberg@cs.helsinki.fi>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 874ca6cd
...@@ -75,7 +75,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id ...@@ -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");
......
...@@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device ...@@ -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");
......
...@@ -142,7 +142,7 @@ static int ns558_isa_probe(int io) ...@@ -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) ...@@ -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");
......
...@@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -469,7 +469,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -655,7 +655,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv ...@@ -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);
......
...@@ -163,7 +163,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs) ...@@ -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;
} }
......
...@@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs) ...@@ -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;
} }
......
...@@ -242,7 +242,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver * ...@@ -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;
......
...@@ -212,7 +212,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d ...@@ -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;
......
...@@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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) {
......
...@@ -262,7 +262,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv) ...@@ -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;
......
...@@ -178,7 +178,7 @@ static struct tgfx __init *tgfx_probe(int *config, int nargs) ...@@ -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;
} }
......
...@@ -260,7 +260,7 @@ static int __init corgikbd_probe(struct device *dev) ...@@ -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;
......
...@@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv) ...@@ -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;
} }
......
...@@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty) ...@@ -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 ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册