[PATCH] Fix numerous kcalloc() calls, convert to kzalloc()

All kcalloc() calls of the form "kcalloc(1,...)" are converted to the
equivalent kzalloc() calls, and a few kcalloc() calls with the incorrect
ordering of the first two arguments are fixed.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 19 insertions, 19 deletions

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 33adeba1a31f..b7fdb4d21a96 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -112,7 +112,7 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
         if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
                 return -ENOMEM;
         }
-        if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
+        if (!(buf = kzalloc(256, GFP_KERNEL))) {
                 kfree (envp);
                 return -ENOMEM;
         }
@@ -220,7 +220,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
         if(!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -243,7 +243,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -294,7 +294,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
         if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
 
@@ -336,7 +336,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
         }
 
         /* set the initial values for the PnP device */
-        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 return -1;
         pnpid32_to_pnpid(node->eisa_id,id);
@@ -374,7 +374,7 @@ static void __init build_devlist(void)
         struct pnp_bios_node *node;
         struct pnp_dev *dev;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return;
 
@@ -391,7 +391,7 @@ static void __init build_devlist(void)
                                 break;
                 }
                 nodes_got++;
-                dev =  kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
+                dev =  kzalloc(sizeof (struct pnp_dev), GFP_KERNEL);
                 if (!dev)
                         break;
                 if(insert_device(dev,node)<0)
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 5a3dfc97f5e9..8027073f7919 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
                 return -EFBIG;
         }
 
-        tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
+        tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL);
         if (!tmpbuf) return -ENOMEM;
 
         if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
@@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
         if (pos >= 0xff)
                 return 0;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
 
         for (nodenum=pos; nodenum<0xff; ) {
@@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         u8 nodenum = (long)data;
         int len;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
                 kfree(node);
@@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
         u8 nodenum = (long)data;
         int ret = count;
 
-        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
+        node = kzalloc(node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index ef508a4de557..95b79685a9d1 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -248,7 +248,7 @@ static void
 pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((p[5] << 8) | p[4]) << 8;
@@ -264,7 +264,7 @@ static void
 pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -280,7 +280,7 @@ static void
 pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -297,7 +297,7 @@ pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
         struct pnp_irq * irq;
         unsigned long bits;
 
-        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (p[2] << 8) | p[1];
@@ -314,7 +314,7 @@ static void
 pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_dma * dma;
-        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = p[1];
@@ -327,7 +327,7 @@ static void
 pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (p[3] << 8) | p[2];
@@ -343,7 +343,7 @@ static void
 pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+        port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (p[2] << 8) | p[1];
@@ -527,7 +527,7 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de
                 case SMALL_TAG_COMPATDEVID: /* compatible ID */
                         if (len != 4)
                                 goto len_err;
-                        dev_id =  kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL);
+                        dev_id =  kzalloc(sizeof (struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 return NULL;
                         memset(dev_id, 0, sizeof(struct pnp_id));