Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp5775844ioo; Wed, 1 Jun 2022 12:19:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKynBwouyzJisYNHdxvtohoKU18NFolKuWJY3ucX1mfMUsVhB7su2q30JsC+KgeLC8ff+8 X-Received: by 2002:a17:902:b588:b0:161:64fe:af8c with SMTP id a8-20020a170902b58800b0016164feaf8cmr968811pls.26.1654111180918; Wed, 01 Jun 2022 12:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654111180; cv=none; d=google.com; s=arc-20160816; b=ZbKnADrVKfStkteBQUeo/oMrKeHNUCio8myXdkFfie8zN8iLH33byz1qNM5kHtqbAZ Xex/MKg/zTbWal8NOZ5JDpHMaWKt+iRBnd9DCkT76C4+Yr/YnsdjnyH+b5fSImhFfUd+ hkLuhgObszaSVRa99US4P0E5eHVfx8Nywe5GMr/VC4sVUQAmNsnjNrgjxgZPn/DeAzJS KFaxVNG9VbY7LZ5LWcCF8GGToVbz6tZMhSirNkriuIpO2O9CUYBWTs/xxelci/1WOFQy RaW9qk+aSNA9ZcqJPtXkBnhQb145NBvbeli/MzMx+H5ys+L5BOXuLriyPibM1J8GiH+v dvOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=5lJaHqjP4Y4kcgTFre7tBDipkJ0FVwE3rdr5k6s/b/k=; b=uGG7YmnhbKmAsmrzecN0rKLUGDVgCh3rRGJzjOyUfoheoN7EWSaVBrGdD8tfiq8zBw RxoT721VBspLCoOaSNq3i0D58u5WNktCO1MqbgdOQUEMlzoz0AJc6HEBJ+buRqLSYUU1 diqV2YmCj9GBo/X2fKcjEpGyiD2d8L1Ncq/bQz5vJ6X85e79ZgAKY9cBmNL4dHLQmQ96 t6GjaZ2tKgCUnaESEhJPcSJdztrmo2TH8H/GlnkN6/jq+FC3fylCqNVoGhZae39LfHDg 0Hk2AkcTQmjQ/clTpCYPraHOy4HoczWOGNt9X/7tYuwMp6rc578aBbRku4UHssG7gH6a KXzw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c14-20020a170902d48e00b0015498a2b02bsi3429697plg.316.2022.06.01.12.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 12:19:40 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BA038159059; Wed, 1 Jun 2022 11:55:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351826AbiFALtc (ORCPT + 99 others); Wed, 1 Jun 2022 07:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbiFALtb (ORCPT ); Wed, 1 Jun 2022 07:49:31 -0400 Received: from mail.meizu.com (edge05.meizu.com [157.122.146.251]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC03B57163 for ; Wed, 1 Jun 2022 04:49:28 -0700 (PDT) Received: from IT-EXMB-1-125.meizu.com (172.16.1.125) by mz-mail12.meizu.com (172.16.1.108) with Microsoft SMTP Server (TLS) id 14.3.487.0; Wed, 1 Jun 2022 19:49:28 +0800 Received: from meizu.meizu.com (172.16.137.70) by IT-EXMB-1-125.meizu.com (172.16.1.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Wed, 1 Jun 2022 19:49:26 +0800 From: Haowen Bai To: CC: , , , , Subject: [PATCH V3] staging: r8188eu: Drop redundant memset overwritten by memcpy Date: Wed, 1 Jun 2022 19:49:24 +0800 Message-ID: <1654084164-10869-1-git-send-email-baihaowen@meizu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.16.137.70] X-ClientProxiedBy: IT-EXMB-1-126.meizu.com (172.16.1.126) To IT-EXMB-1-125.meizu.com (172.16.1.125) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The region set by the call to memset is immediately overwritten by the subsequent call to memcpy. So we drop redundant memset. Signed-off-by: Haowen Bai --- V1->V2: change title for unique subjects. V2->V3: merge 1 patch with both changes. drivers/staging/r8188eu/core/rtw_ioctl_set.c | 1 - drivers/staging/r8188eu/core/rtw_mlme.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging/r8188eu/core/rtw_ioctl_set.c index 7ba75f73e47e..17f6bcbeebf4 100644 --- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c +++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c @@ -71,7 +71,6 @@ u8 rtw_do_join(struct adapter *padapter) pibss = padapter->registrypriv.dev_network.MacAddress; - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(padapter); diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index 5a815642c3f6..56c8bd5f4c60 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -676,7 +676,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); @@ -1253,7 +1252,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); rtw_update_registrypriv_dev_network(adapter); -- 2.7.4