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.4 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 A4A6CC282E1 for ; Fri, 24 May 2019 18:41:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70582217D7 for ; Fri, 24 May 2019 18:41:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uOlmCXjv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729678AbfEXSlP (ORCPT ); Fri, 24 May 2019 14:41:15 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40098 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727344AbfEXSlP (ORCPT ); Fri, 24 May 2019 14:41:15 -0400 Received: by mail-pg1-f195.google.com with SMTP id d30so5496962pgm.7 for ; Fri, 24 May 2019 11:41:14 -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=enedDcHOKwZ9FHmS+00cJM3D7/hClZHS2EbEfHPQk5U=; b=uOlmCXjvTURxVtROiVg3BpdHBOk/9A+22CVFBzoHGcNrqGbb8LSQDQ1avRYlXD5/+2 JXoj3D7XK+gJvQ66NLOUsjaBfav6U7le5Txksh+l3cFHfob68iJA4qABK9OXSuVzdBwe WzkdoXzHqEcxhyPsrIwLV6J/hZNe+h8t+yBD4vQktVWZrJ0YqtaT9pwkvwZ27fU5P3Lw taMBMmY/BjFocIq8neVOlLpQXx3W5uT7JQ7RZbC9FbOSPD+Zt+fhXdCTC3UyKdg/lbHB WoqZbUD8C4oUmXADB5UcBe1VlR+w02uJqplIhIcHbN6GgbSPgdV9GcnsSlwzLDudt7Io jxvA== 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=enedDcHOKwZ9FHmS+00cJM3D7/hClZHS2EbEfHPQk5U=; b=RBhF3bn72B56jTmHq4LOFNBMylp2xgfR/X05abYY30H0uV6tkiMpO59PUWR37tmbT2 jrQqK6nEC1lxqs5k4Bd4ZeO/HN2+Tgt6WLYmdrQ+IbvQw0XfHH5vBgpf4h1eG6aFFWhC mhgITfsfUcvUMw/s96twGPwaEjvJEcd8q+vcfiAO+/teYWPhSITKhZAJZfyUYgMqWuIi JZSORrS7Y1BOYgKAYDvrFb3G2XpfOj/FTWSA4qJj33aCNUndV333RHrbM2YfL9ORrWZn Ki2ljPsW7v524P7rT+OzNJTyBCYKcsS9L4VrUZTR6BjPXt0nelJ6L6va7JQVcV9xT8W5 oo2A== X-Gm-Message-State: APjAAAVJal7+k78IN6e5/ldaB+dQZj5gWwZEU02YqP6yj9pgaiYTgoEt 12kFbln9kQz+5VtOwQDc+2o= X-Google-Smtp-Source: APXvYqwCBwkebRvyL3c/9tanH7F7zOjVgiNGySmCeH5IN0s9c9ZLo1WTjyzra5OWxmcRK0Ccpe1avw== X-Received: by 2002:a17:90a:1a84:: with SMTP id p4mr11470288pjp.15.1558723274170; Fri, 24 May 2019 11:41:14 -0700 (PDT) Received: from hari-Inspiron-1545 ([183.83.92.73]) by smtp.gmail.com with ESMTPSA id t33sm3036573pjb.1.2019.05.24.11.41.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 11:41:13 -0700 (PDT) Date: Sat, 25 May 2019 00:11:05 +0530 From: Hariprasad Kelam To: Greg Kroah-Hartman , Hariprasad Kelam , Nishka Dasgupta , Kimberly Brown , Mamta Shukla , Murray McAllister , Puranjay Mohan , Hardik Singh Rathore , Omer Efrat , Quytelda Kahja , Larry Finger , Arnd Bergmann , Jeeeun Evans , Michael Straube , Emanuel Bennici , Hans de Goede , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [Patch v5] staging: rtl8723bs: core: rtw_ap: fix Unneeded variable: "ret". Return "0" Message-ID: <20190524184105.GA3975@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 Changes v4 - prepare patch on linux-next Changes v5 - cleanup subject and commit message --- 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 912ac2f..7bebb41 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 996bd1a..9bc6856 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -2870,9 +2870,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 bfbbcf0..236a462 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -3753,7 +3753,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; */ @@ -3765,8 +3765,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) @@ -4253,7 +4252,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