public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2.6.19] prism54: replace kmalloc+memset with kzalloc
@ 2006-12-02 11:35 Yan Burman
  0 siblings, 0 replies; only message in thread
From: Yan Burman @ 2006-12-02 11:35 UTC (permalink / raw)
  To: linux-kernel; +Cc: prism54-private, trivial

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>

diff -rubp linux-2.6.19-rc5_orig/drivers/net/wireless/prism54/isl_ioctl.c linux-2.6.19-rc5_kzalloc/drivers/net/wireless/prism54/isl_ioctl.c
--- linux-2.6.19-rc5_orig/drivers/net/wireless/prism54/isl_ioctl.c	2006-11-09 12:16:21.000000000 +0200
+++ linux-2.6.19-rc5_kzalloc/drivers/net/wireless/prism54/isl_ioctl.c	2006-11-11 22:44:04.000000000 +0200
@@ -2141,11 +2141,9 @@ prism54_wpa_bss_ie_add(islpci_private *p
 					 struct islpci_bss_wpa_ie, list);
 			list_del(&bss->list);
 		} else {
-			bss = kmalloc(sizeof (*bss), GFP_ATOMIC);
-			if (bss != NULL) {
+			bss = kzalloc(sizeof (*bss), GFP_ATOMIC);
+			if (bss != NULL)
 				priv->num_bss_wpa++;
-				memset(bss, 0, sizeof (*bss));
-			}
 		}
 		if (bss != NULL) {
 			memcpy(bss->bssid, bssid, ETH_ALEN);
@@ -2685,11 +2683,10 @@ prism2_ioctl_set_generic_element(struct 
                return -EINVAL;
 
        alen = sizeof(*attach) + len;
-       attach = kmalloc(alen, GFP_KERNEL);
+       attach = kzalloc(alen, GFP_KERNEL);
        if (attach == NULL)
                return -ENOMEM;
 
-       memset(attach, 0, alen);
 #define WLAN_FC_TYPE_MGMT 0
 #define WLAN_FC_STYPE_ASSOC_REQ 0
 #define WLAN_FC_STYPE_REASSOC_REQ 2
diff -rubp linux-2.6.19-rc5_orig/drivers/net/wireless/prism54/oid_mgt.c linux-2.6.19-rc5_kzalloc/drivers/net/wireless/prism54/oid_mgt.c
--- linux-2.6.19-rc5_orig/drivers/net/wireless/prism54/oid_mgt.c	2006-11-09 12:16:21.000000000 +0200
+++ linux-2.6.19-rc5_kzalloc/drivers/net/wireless/prism54/oid_mgt.c	2006-11-11 22:44:04.000000000 +0200
@@ -235,12 +235,10 @@ mgt_init(islpci_private *priv)
 {
 	int i;
 
-	priv->mib = kmalloc(OID_NUM_LAST * sizeof (void *), GFP_KERNEL);
+	priv->mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);
 	if (!priv->mib)
 		return -ENOMEM;
 
-	memset(priv->mib, 0, OID_NUM_LAST * sizeof (void *));
-
 	/* Alloc the cache */
 	for (i = 0; i < OID_NUM_LAST; i++) {
 		if (isl_oid[i].flags & OID_FLAG_CACHED) {




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-12-02 11:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-02 11:35 [PATCH 2.6.19] prism54: replace kmalloc+memset with kzalloc Yan Burman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox