[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, 11 insertions, 25 deletions

diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 0afe442db3b0..a20f33b4a220 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -331,12 +331,10 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
          * Allocate the main control structure for this instance.
          */
         maxmaxcode = MAXCODE(bits);
-        db = (struct bsd_db *) kmalloc (sizeof (struct bsd_db),GFP_KERNEL);
+        db = kzalloc (sizeof (struct bsd_db),GFP_KERNEL);
         if (!db)
                 return NULL;
 
-        memset (db, 0, sizeof(struct bsd_db));
-
         db->xmit = data->flags & IPPP_COMP_FLAG_XMIT;
         decomp = db->xmit ? 0 : 1;
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index a610a05aa217..6a2ef0a87ed9 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -2072,21 +2072,19 @@ isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding)
 
         if ((adding) && (d->rcverr))
                 kfree(d->rcverr);
-        if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
+        if (!(d->rcverr = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
                 return -1;
         }
-        memset((char *) d->rcverr, 0, sizeof(int) * m);
 
         if ((adding) && (d->rcvcount))
                 kfree(d->rcvcount);
-        if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
+        if (!(d->rcvcount = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
                 if (!adding)
                         kfree(d->rcverr);
                 return -1;
         }
-        memset((char *) d->rcvcount, 0, sizeof(int) * m);
 
         if ((adding) && (d->rpqueue)) {
                 for (j = 0; j < d->channels; j++)
@@ -2226,11 +2224,10 @@ register_isdn(isdn_if * i)
                 printk(KERN_WARNING "register_isdn: No write routine given.\n");
                 return 0;
         }
-        if (!(d = kmalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
+        if (!(d = kzalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
                 return 0;
         }
-        memset((char *) d, 0, sizeof(isdn_driver_t));
 
         d->maxbufsize = i->maxbufsize;
         d->pktcount = 0;
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 2e4daebfb7e0..c36c817578cb 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2542,17 +2542,15 @@ isdn_net_new(char *name, struct net_device *master)
                 printk(KERN_WARNING "isdn_net: interface %s already exists\n", name);
                 return NULL;
         }
-        if (!(netdev = (isdn_net_dev *) kmalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
+        if (!(netdev = kzalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
                 printk(KERN_WARNING "isdn_net: Could not allocate net-device\n");
                 return NULL;
         }
-        memset(netdev, 0, sizeof(isdn_net_dev));
-        if (!(netdev->local = (isdn_net_local *) kmalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
+        if (!(netdev->local = kzalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
                 printk(KERN_WARNING "isdn_net: Could not allocate device locals\n");
                 kfree(netdev);
                 return NULL;
         }
-        memset(netdev->local, 0, sizeof(isdn_net_local));
         if (name == NULL)
                 strcpy(netdev->local->name, "         ");
         else
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 26e46720fc1c..43811795b46b 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -876,14 +876,12 @@ isdn_ppp_init(void)
 #endif /* CONFIG_ISDN_MPP */
 
         for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
-                if (!(ippp_table[i] = (struct ippp_struct *)
-                      kmalloc(sizeof(struct ippp_struct), GFP_KERNEL))) {
+                if (!(ippp_table[i] = kzalloc(sizeof(struct ippp_struct), GFP_KERNEL))) {
                         printk(KERN_WARNING "isdn_ppp_init: Could not alloc ippp_table\n");
                         for (j = 0; j < i; j++)
                                 kfree(ippp_table[j]);
                         return -1;
                 }
-                memset((char *) ippp_table[i], 0, sizeof(struct ippp_struct));
                 spin_lock_init(&ippp_table[i]->buflock);
                 ippp_table[i]->state = 0;
                 ippp_table[i]->first = ippp_table[i]->rq + NUM_RCV_BUFFS - 1;
@@ -1529,10 +1527,8 @@ static int isdn_ppp_mp_bundle_array_init(void)
 {
         int i;
         int sz = ISDN_MAX_CHANNELS*sizeof(ippp_bundle);
-        if( (isdn_ppp_bundle_arr = (ippp_bundle*)kmalloc(sz, 
-                                                        GFP_KERNEL)) == NULL )
+        if( (isdn_ppp_bundle_arr = kzalloc(sz, GFP_KERNEL)) == NULL )
                 return -ENOMEM;
-        memset(isdn_ppp_bundle_arr, 0, sz);
         for( i = 0; i < ISDN_MAX_CHANNELS; i++ )
                 spin_lock_init(&isdn_ppp_bundle_arr[i].lock);
         return 0;
@@ -2246,13 +2242,12 @@ static void isdn_ppp_ccp_xmit_reset(struct ippp_struct *is, int proto,
 static struct ippp_ccp_reset *isdn_ppp_ccp_reset_alloc(struct ippp_struct *is)
 {
         struct ippp_ccp_reset *r;
-        r = kmalloc(sizeof(struct ippp_ccp_reset), GFP_KERNEL);
+        r = kzalloc(sizeof(struct ippp_ccp_reset), GFP_KERNEL);
         if(!r) {
                 printk(KERN_ERR "ippp_ccp: failed to allocate reset data"
                        " structure - no mem\n");
                 return NULL;
         }
-        memset(r, 0, sizeof(struct ippp_ccp_reset));
         printk(KERN_DEBUG "ippp_ccp: allocated reset data structure %p\n", r);
         is->reset = r;
         return r;
@@ -2338,10 +2333,9 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s
                        id);
                 return NULL;
         } else {
-                rs = kmalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL);
+                rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL);
                 if(!rs)
                         return NULL;
-                memset(rs, 0, sizeof(struct ippp_ccp_reset_state));
                 rs->state = CCPResetIdle;
                 rs->is = is;
                 rs->id = id;
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index 38619e8cd823..5484d3c38a57 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -92,9 +92,8 @@ isdn_v110_open(unsigned char key, int hdrlen, int maxsize)
         int i;
         isdn_v110_stream *v;
 
-        if ((v = kmalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
+        if ((v = kzalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
                 return NULL;
-        memset(v, 0, sizeof(isdn_v110_stream));
         v->key = key;
         v->nbits = 0;
         for (i = 0; key & (1 << i); i++)