[PATCH] isdn: replace kmalloc+memset with kzalloc

Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 9 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index fd5d7364a487..eba10466ccc6 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -121,10 +121,9 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
     p_dev->conf.Present = PRESENT_OPTION;
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local)
         goto err;
-    memset(local, 0, sizeof(local_info_t));
     p_dev->priv = local;
 
     return avmcs_config(p_dev);
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index da2729247713..7a69a18d07e2 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -65,18 +65,15 @@ avmcard *b1_alloc_card(int nr_controllers)
         avmctrl_info *cinfo;
         int i;
 
-        card = kmalloc(sizeof(*card), GFP_KERNEL);
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
         if (!card)
                 return NULL;
 
-        memset(card, 0, sizeof(*card));
-
-        cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
+        cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
         if (!cinfo) {
                 kfree(card);
                 return NULL;
         }
-        memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);
 
         card->ctrlinfo = cinfo;
         for (i = 0; i < nr_controllers; i++) {
@@ -718,12 +715,11 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize)
         avmcard_dmainfo *p;
         void *buf;
 
-        p = kmalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
+        p = kzalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
         if (!p) {
                 printk(KERN_WARNING "%s: no memory.\n", name);
                 goto err;
         }
-        memset(p, 0, sizeof(avmcard_dmainfo));
 
         p->recvbuf.size = rsize;
         buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);