[PATCH] serial: replace kmalloc+memset with kzalloc

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 6 insertions, 12 deletions

diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index 244f63be3a03..81792e6eeb2d 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -71,14 +71,13 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto out_disable_device;
         }
 
-        brd = kmalloc(sizeof(struct jsm_board), GFP_KERNEL);
+        brd = kzalloc(sizeof(struct jsm_board), GFP_KERNEL);
         if (!brd) {
                 dev_err(&pdev->dev,
                         "memory allocation for board structure failed\n");
                 rc = -ENOMEM;
                 goto out_release_regions;
         }
-        memset(brd, 0, sizeof(struct jsm_board));
 
         /* store the info for the board we've found */
         brd->boardnum = adapter_count++;
@@ -152,7 +151,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
          * Okay to malloc with GFP_KERNEL, we are not at interrupt
          * context, and there are no locks held.
          */
-        brd->flipbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
+        brd->flipbuf = kzalloc(MYFLIPLEN, GFP_KERNEL);
         if (!brd->flipbuf) {
                 /* XXX: leaking all resources from jsm_tty_init and
                         jsm_uart_port_init here! */
@@ -160,7 +159,6 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 retval = -ENOMEM;
                 goto out_free_irq;
         }
-        memset(brd->flipbuf, 0, MYFLIPLEN);
 
         pci_set_drvdata(pdev, brd);
 
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 7cf1c60027f8..be22bbdbc8e5 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -194,31 +194,28 @@ static int jsm_tty_open(struct uart_port *port)
         /* Drop locks, as malloc with GFP_KERNEL can sleep */
 
         if (!channel->ch_rqueue) {
-                channel->ch_rqueue = (u8 *) kmalloc(RQUEUESIZE, GFP_KERNEL);
+                channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
                 if (!channel->ch_rqueue) {
                         jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
                                 "unable to allocate read queue buf");
                         return -ENOMEM;
                 }
-                memset(channel->ch_rqueue, 0, RQUEUESIZE);
         }
         if (!channel->ch_equeue) {
-                channel->ch_equeue = (u8 *) kmalloc(EQUEUESIZE, GFP_KERNEL);
+                channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
                 if (!channel->ch_equeue) {
                         jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
                                 "unable to allocate error queue buf");
                         return -ENOMEM;
                 }
-                memset(channel->ch_equeue, 0, EQUEUESIZE);
         }
         if (!channel->ch_wqueue) {
-                channel->ch_wqueue = (u8 *) kmalloc(WQUEUESIZE, GFP_KERNEL);
+                channel->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL);
                 if (!channel->ch_wqueue) {
                         jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
                                 "unable to allocate write queue buf");
                         return -ENOMEM;
                 }
-                memset(channel->ch_wqueue, 0, WQUEUESIZE);
         }
 
         channel->ch_flags &= ~(CH_OPENING);
@@ -392,13 +389,12 @@ int jsm_tty_init(struct jsm_board *brd)
                          * Okay to malloc with GFP_KERNEL, we are not at
                          * interrupt context, and there are no locks held.
                          */
-                        brd->channels[i] = kmalloc(sizeof(struct jsm_channel), GFP_KERNEL);
+                        brd->channels[i] = kzalloc(sizeof(struct jsm_channel), GFP_KERNEL);
                         if (!brd->channels[i]) {
                                 jsm_printk(CORE, ERR, &brd->pci_dev,
                                         "%s:%d Unable to allocate memory for channel struct\n",
                                                          __FILE__, __LINE__);
                         }
-                        memset(brd->channels[i], 0, sizeof(struct jsm_channel));
                 }
         }