[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>

5 files changed, 5 insertions, 10 deletions

diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index 6bac43cc91bd..b2ae4ec1e49e 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -745,12 +745,11 @@ hycapi_capi_create(hysdn_card *card)
                 return 1;
         }
         if (!card->hyctrlinfo) {
-                cinfo = (hycapictrl_info *) kmalloc(sizeof(hycapictrl_info), GFP_ATOMIC);
+                cinfo = kzalloc(sizeof(hycapictrl_info), GFP_ATOMIC);
                 if (!cinfo) {
                         printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n");
                         return -ENOMEM;
                 }
-                memset(cinfo, 0, sizeof(hycapictrl_info));
                 card->hyctrlinfo = cinfo;
                 cinfo->card = card;
                 spin_lock_init(&cinfo->lock);
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c
index 6d0eb0f42fca..be787e16bb79 100644
--- a/drivers/isdn/hysdn/hysdn_boot.c
+++ b/drivers/isdn/hysdn/hysdn_boot.c
@@ -278,14 +278,13 @@ pof_write_open(hysdn_card * card, unsigned char **bufp)
                 return (-ERR_ALREADY_BOOT);     /* boot already active */
         }
         /* error no mem available */
-        if (!(boot = kmalloc(sizeof(struct boot_data), GFP_KERNEL))) {
+        if (!(boot = kzalloc(sizeof(struct boot_data), GFP_KERNEL))) {
                 if (card->debug_flags & LOG_MEM_ERR)
                         hysdn_addlog(card, "POF open: unable to allocate mem");
                 return (-EFAULT);
         }
         card->boot = boot;
         card->state = CARD_STATE_BOOTING;
-        memset(boot, 0, sizeof(struct boot_data));
 
         card->stopcard(card);   /* first stop the card */
         if (card->testram(card)) {
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index b702ed27252b..9e01748a176e 100644
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -81,11 +81,10 @@ search_cards(void)
                 if (pci_enable_device(akt_pcidev))
                         continue;
 
-                if (!(card = kmalloc(sizeof(hysdn_card), GFP_KERNEL))) {
+                if (!(card = kzalloc(sizeof(hysdn_card), GFP_KERNEL))) {
                         printk(KERN_ERR "HYSDN: unable to alloc device mem \n");
                         return;
                 }
-                memset(card, 0, sizeof(hysdn_card));
                 card->myid = cardmax;   /* set own id */
                 card->bus = akt_pcidev->bus->number;
                 card->devfn = akt_pcidev->devfn;        /* slot + function */
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index d205249a1242..557d96c78a62 100644
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -278,11 +278,10 @@ hysdn_net_create(hysdn_card * card)
                 return (-ENOMEM);
         }
         hysdn_net_release(card);        /* release an existing net device */
-        if ((dev = kmalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
+        if ((dev = kzalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING "HYSDN: unable to allocate mem\n");
                 return (-ENOMEM);
         }
-        memset(dev, 0, sizeof(struct net_local));       /* clean the structure */
 
         spin_lock_init(&((struct net_local *) dev)->lock);
 
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 4d238eff1773..f241f5e551cb 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -405,8 +405,7 @@ hysdn_proclog_init(hysdn_card * card)
 
         /* create a cardlog proc entry */
 
-        if ((pd = (struct procdata *) kmalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) {
-                memset(pd, 0, sizeof(struct procdata));
+        if ((pd = kzalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) {
                 sprintf(pd->log_name, "%s%d", PROC_LOG_BASENAME, card->myid);
                 if ((pd->log = create_proc_entry(pd->log_name, S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry)) != NULL) {
                         pd->log->proc_fops = &log_fops;