[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, 6 insertions, 12 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 0475a54df83a..d22c0224fde6 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -215,13 +215,12 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
         unsigned int minor = 0;
         unsigned long flags;
 
-        mp = kmalloc(sizeof(*mp), GFP_ATOMIC);
+        mp = kzalloc(sizeof(*mp), GFP_ATOMIC);
         if (!mp) {
                 printk(KERN_ERR "capi: can't alloc capiminor\n");
                 return NULL;
         }
 
-        memset(mp, 0, sizeof(struct capiminor));
         mp->ap = ap;
         mp->ncci = ncci;
         mp->msgid = 0;
@@ -304,10 +303,9 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
         struct capiminor *mp = NULL;
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 
-        np = kmalloc(sizeof(*np), GFP_ATOMIC);
+        np = kzalloc(sizeof(*np), GFP_ATOMIC);
         if (!np)
                 return NULL;
-        memset(np, 0, sizeof(struct capincci));
         np->ncci = ncci;
         np->cdev = cdev;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -384,10 +382,9 @@ static struct capidev *capidev_alloc(void)
         struct capidev *cdev;
         unsigned long flags;
 
-        cdev = kmalloc(sizeof(*cdev), GFP_KERNEL);
+        cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
         if (!cdev)
                 return NULL;
-        memset(cdev, 0, sizeof(struct capidev));
 
         init_MUTEX(&cdev->ncci_list_sem);
         skb_queue_head_init(&cdev->recvqueue);
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index b6f9476c0501..097bfa7bc323 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -334,12 +334,11 @@ static capidrv_plci *new_plci(capidrv_contr * card, int chan)
 {
         capidrv_plci *plcip;
 
-        plcip = (capidrv_plci *) kmalloc(sizeof(capidrv_plci), GFP_ATOMIC);
+        plcip = kzalloc(sizeof(capidrv_plci), GFP_ATOMIC);
 
         if (plcip == 0)
                 return NULL;
 
-        memset(plcip, 0, sizeof(capidrv_plci));
         plcip->state = ST_PLCI_NONE;
         plcip->plci = 0;
         plcip->msgid = 0;
@@ -404,12 +403,11 @@ static inline capidrv_ncci *new_ncci(capidrv_contr * card,
 {
         capidrv_ncci *nccip;
 
-        nccip = (capidrv_ncci *) kmalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
+        nccip = kzalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
 
         if (nccip == 0)
                 return NULL;
 
-        memset(nccip, 0, sizeof(capidrv_ncci));
         nccip->ncci = ncci;
         nccip->state = ST_NCCI_NONE;
         nccip->plcip = plcip;
@@ -2005,12 +2003,11 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                 printk(KERN_WARNING "capidrv: (%s) Could not reserve module\n", id);
                 return -1;
         }
-        if (!(card = (capidrv_contr *) kmalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {
+        if (!(card = kzalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {
                 printk(KERN_WARNING
                  "capidrv: (%s) Could not allocate contr-struct.\n", id);
                 return -1;
         }
-        memset(card, 0, sizeof(capidrv_contr));
         card->owner = THIS_MODULE;
         init_timer(&card->listentimer);
         strcpy(card->name, id);