From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE023C282CE for ; Wed, 22 May 2019 17:11:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A46F32081C for ; Wed, 22 May 2019 17:11:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NBtY4bsE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730326AbfEVRLq (ORCPT ); Wed, 22 May 2019 13:11:46 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:36473 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729851AbfEVRLq (ORCPT ); Wed, 22 May 2019 13:11:46 -0400 Received: by mail-pl1-f195.google.com with SMTP id d21so1385927plr.3 for ; Wed, 22 May 2019 10:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=t0UqOUcwsVfUne/Mk2u/aR+T7jIgf7upi5wewMeNKvY=; b=NBtY4bsEqcw2XI65pq2MfduUROhh69qy25aq/qncLftq+hxQejrHWP2rMFp+ETd4se WL8bKfyXlDncitC9Sr8SPRzO3Zz97RqTXz/DBtvu6et6rRKnUCrOAumbIBjANmMoTOVX j1JplsIhT50FWog4pEGwf90cwfqIfdtcr54kbl5qybfnVlUvdb3oZmnJz5pcH6Y89CbE Mzky6fAKrEyOZOANVgp3ab/x/r/g+wx1QouIwEylD9q46dFzTgZLQrB7SQexLxIjgqjN eYHl+1WfLz4BQHiREHByeltkuxVASLUuDHwofets3OZiQvc1vHV1WSGRiJGt/ZgEOVGW rwCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=t0UqOUcwsVfUne/Mk2u/aR+T7jIgf7upi5wewMeNKvY=; b=fRGSezspszlkTGU75wEdVeywNWG8is2jlt5Q0p5DU4UPf+XbN97lcgDC8Ozdhf+sem 7WRQEuWr8QTZYfV67M/tB7h7b6QDcL/89jASYFIVTJVshhuBPSmFLosESsC7bznDaTv5 jWpPbYDK/kRKgQd/mpcaYMwtVBcEsMxTcO8L+uPEuv8MCBPp1bKXw0iXHGMeLBTB6ctY lg/6LBzupizD7ZVrOM8ux+G2xJVoDzF0DDQYuQ3FTxE3q4NKzgmBD22C5clLkB9KCd4f x4pD7HSzzzCWxiBiQF4QSb4PkLj3qqsaBVvWUwyoYiamLYb8X3SvCmP5O5KRqA7k8sKd PJ7A== X-Gm-Message-State: APjAAAUbjv8xCzD7tuAJ0R2mAZfkcy6a5+zqV/MFrfGubzTgvkVIF3SM 9FJf5tixc3X0Pwnl1L2jZrg= X-Google-Smtp-Source: APXvYqzx7f17QFtXsUs4j+XXtPYR1e4ZWCrim9Se4T7aanOlSna2/sdZOolZW8zteVMmKvO7z30iXg== X-Received: by 2002:a17:902:6bc4:: with SMTP id m4mr15462401plt.266.1558545105482; Wed, 22 May 2019 10:11:45 -0700 (PDT) Received: from hari-Inspiron-1545 ([183.83.92.73]) by smtp.gmail.com with ESMTPSA id h13sm25492704pgk.55.2019.05.22.10.11.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 10:11:44 -0700 (PDT) Date: Wed, 22 May 2019 22:41:37 +0530 From: Hariprasad Kelam To: Greg Kroah-Hartman , Murray McAllister , Hariprasad Kelam , Nishka Dasgupta , Kimberly Brown , Anirudh Rayabharam , Hardik Singh Rathore , Mamta Shukla , Quytelda Kahja , Omer Efrat , Larry Finger , Arnd Bergmann , Michael Straube , Emanuel Bennici , Jia-Ju Bai , Wen Yang , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] staging: rtl8723bs: core: rtw_ap: fix Unneeded variable: "ret". Return "0 Message-ID: <20190522171137.GA5579@hari-Inspiron-1545> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Function "rtw_sta_flush" always returns 0 value. So change return type of rtw_sta_flush from int to void. Same thing applies for rtw_hostapd_sta_flush Signed-off-by: Hariprasad Kelam ------ Changes v2 - change return type of rtw_sta_flush ------ Changes v3 - fix indentaion issue --- drivers/staging/rtl8723bs/core/rtw_ap.c | 7 ++----- drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++-- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 7 +++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index bc02306..19418ea 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -2189,10 +2189,9 @@ u8 ap_free_sta( return beacon_updated; } -int rtw_sta_flush(struct adapter *padapter) +void rtw_sta_flush(struct adapter *padapter) { struct list_head *phead, *plist; - int ret = 0; struct sta_info *psta = NULL; struct sta_priv *pstapriv = &padapter->stapriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -2202,7 +2201,7 @@ int rtw_sta_flush(struct adapter *padapter) DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev)); if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) - return ret; + return; spin_lock_bh(&pstapriv->asoc_list_lock); phead = &pstapriv->asoc_list; @@ -2226,8 +2225,6 @@ int rtw_sta_flush(struct adapter *padapter) issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); associated_clients_update(padapter, true); - - return ret; } /* called > TSR LEVEL for USB or SDIO Interface*/ diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/rtl8723bs/include/rtw_ap.h index fd56c9db..d6f3a3a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ap.h +++ b/drivers/staging/rtl8723bs/include/rtw_ap.h @@ -31,7 +31,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta); void sta_info_update(struct adapter *padapter, struct sta_info *psta); void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta); u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason); -int rtw_sta_flush(struct adapter *padapter); +void rtw_sta_flush(struct adapter *padapter); void start_ap_mode(struct adapter *padapter); void stop_ap_mode(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index db553f2..ce57e0e 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -2896,9 +2896,9 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev flush_all_cam_entry(padapter); /* clear CAM */ - ret = rtw_sta_flush(padapter); + rtw_sta_flush(padapter); - return ret; + return 0; } diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index e3d3569..a4d05f2 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -3754,7 +3754,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int } -static int rtw_hostapd_sta_flush(struct net_device *dev) +static void rtw_hostapd_sta_flush(struct net_device *dev) { /* _irqL irqL; */ /* struct list_head *phead, *plist; */ @@ -3766,8 +3766,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) flush_all_cam_entry(padapter); /* clear CAM */ - return rtw_sta_flush(padapter); - + rtw_sta_flush(padapter); } static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) @@ -4254,7 +4253,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) switch (param->cmd) { case RTL871X_HOSTAPD_FLUSH: - ret = rtw_hostapd_sta_flush(dev); + rtw_hostapd_sta_flush(dev); break; -- 2.7.4