From 5ddd113297288d521faeb551ea575513dfb37828 Mon Sep 17 00:00:00 2001 From: Daeseok Youn Date: Fri, 14 Mar 2014 18:08:43 +0900 Subject: [PATCH] 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(). Signed-off-by: Daeseok Youn Signed-off-by: Greg Kroah-Hartman --- drivers/staging/cxt1e1/hwprobe.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c index d87a011360bd..d41fb79e3304 100644 --- a/drivers/staging/cxt1e1/hwprobe.c +++ b/drivers/staging/cxt1e1/hwprobe.c @@ -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; } -- 2.30.2