diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-06 18:18:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:45 -0400 |
commit | a97e148a8b8da8b04bc3e18ceb824a8f5f56d567 (patch) | |
tree | 6839a014f4315988e4123e7de68ca35d5585ca09 /drivers/input/gameport | |
parent | 874ca6cd3fb454f4dfafd2bbb6c6893303227c3f (diff) |
[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>
Diffstat (limited to 'drivers/input/gameport')
-rw-r--r-- | drivers/input/gameport/emu10k1-gp.c | 2 | ||||
-rw-r--r-- | drivers/input/gameport/fm801-gp.c | 2 | ||||
-rw-r--r-- | drivers/input/gameport/ns558.c | 4 |
3 files changed, 4 insertions, 4 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 | |||
75 | if (!request_region(ioport, iolen, "emu10k1-gp")) | 75 | if (!request_region(ioport, iolen, "emu10k1-gp")) |
76 | return -EBUSY; | 76 | return -EBUSY; |
77 | 77 | ||
78 | emu = kcalloc(1, sizeof(struct emu), GFP_KERNEL); | 78 | emu = kzalloc(sizeof(struct emu), GFP_KERNEL); |
79 | port = gameport_allocate_port(); | 79 | port = gameport_allocate_port(); |
80 | if (!emu || !port) { | 80 | if (!emu || !port) { |
81 | printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n"); | 81 | 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 | |||
83 | struct fm801_gp *gp; | 83 | struct fm801_gp *gp; |
84 | struct gameport *port; | 84 | struct gameport *port; |
85 | 85 | ||
86 | gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL); | 86 | gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL); |
87 | port = gameport_allocate_port(); | 87 | port = gameport_allocate_port(); |
88 | if (!gp || !port) { | 88 | if (!gp || !port) { |
89 | printk(KERN_ERR "fm801-gp: Memory allocation failed\n"); | 89 | 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) | |||
142 | return -EBUSY; | 142 | return -EBUSY; |
143 | } | 143 | } |
144 | 144 | ||
145 | ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL); | 145 | ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL); |
146 | port = gameport_allocate_port(); | 146 | port = gameport_allocate_port(); |
147 | if (!ns558 || !port) { | 147 | if (!ns558 || !port) { |
148 | printk(KERN_ERR "ns558: Memory allocation failed.\n"); | 148 | 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 | if (!request_region(ioport, iolen, "ns558-pnp")) | 215 | if (!request_region(ioport, iolen, "ns558-pnp")) |
216 | return -EBUSY; | 216 | return -EBUSY; |
217 | 217 | ||
218 | ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL); | 218 | ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL); |
219 | port = gameport_allocate_port(); | 219 | port = gameport_allocate_port(); |
220 | if (!ns558 || !port) { | 220 | if (!ns558 || !port) { |
221 | printk(KERN_ERR "ns558: Memory allocation failed\n"); | 221 | printk(KERN_ERR "ns558: Memory allocation failed\n"); |