Skip to contentSkip to conversation

staging: cxt1e1: remove redundant memset() call

PATCH New Daeseok Youn 1 participant 1 message Mar 14, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: cxt1e1: remove redundant memset() call

The banner array doens't need to set to 0.
sprintf() adds a terminating '\0'.

And the sn array can be declared and initialized to zero. So remove redundant memset() with zero.

Remove unnecessary cast for memcpy().

---
 drivers/staging/cxt1e1/hwprobe.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
drivers/staging/cxt1e1/hwprobe.c +3 -9
index d87a011..d41fb79 100644
@@ -51,22 +51,16 @@ show_two(hdw_info_t *hi, int brdno)
 	struct pci_dev *pdev;
 	char       *bid;
 	char       banner[80];
-	char	sn[6];
-
-	/* clear print buffer */
-	memset(banner, 0, 80);
+	char	sn[6] = {0,};
 
 	ci = (ci_t *)(netdev_priv(hi->ndev));
 	bid = sbeid_get_bdname(ci);
 	switch (hi->promfmt) {
 	case PROM_FORMAT_TYPE1:
-		memcpy(sn, (FLD_TYPE1 *)(hi->mfg_info.pft1.Serial), 6);
+		memcpy(sn, hi->mfg_info.pft1.Serial, 6);
 		break;
 	case PROM_FORMAT_TYPE2:
-		memcpy(sn, (FLD_TYPE2 *)(hi->mfg_info.pft2.Serial), 6);
-		break;
-	default:
-		memset(sn, 0, 6);
+		memcpy(sn, hi->mfg_info.pft2.Serial, 6);
 		break;
 	}
 
Signature · 1 line
1.7.4.4