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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 4F38CC433DB for ; Mon, 15 Feb 2021 23:36:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15C5D61490 for ; Mon, 15 Feb 2021 23:36:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229806AbhBOXff (ORCPT ); Mon, 15 Feb 2021 18:35:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbhBOXf0 (ORCPT ); Mon, 15 Feb 2021 18:35:26 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B83F2C0613D6 for ; Mon, 15 Feb 2021 15:34:45 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id g6so10997821wrs.11 for ; Mon, 15 Feb 2021 15:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BuvgedmN4/CYNm0K/K7y4QPZsyXKlASI/aChbguICAc=; b=qg3KfU/fc5L+Wdrpcg9GEtmscmWH81wBc1tvRfuoSc70Xk1pmoz3sgLUs5Ddo7MLTs gEEGDY9rzml32Yrzfk0cdqlzBMYl2GlILgrXgK5nZ51vyPJg/eFJ8CnzQNQ4vxuGJudu vN8zkLdX7eZ/YmyeAwCw/Ela5i3a5vnUM6282zI5vXlGrN1aj7lGJrSe+WyKSErqKD0z pM7vWp6VzW4nAD0v73TUfCNpEp7mJjY5jmsISDQQcwAbiAl4M4VsgiZp0jtTsF8Q+nzg 5+Kln8eHaoDzJcsofRZMaesaItTqZ7VjmEUlgMWpn5BarvEjWp82LfZzzNIL8VHPiUA7 fKWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BuvgedmN4/CYNm0K/K7y4QPZsyXKlASI/aChbguICAc=; b=JHrXXplIZW5wU3QEscVYqXL9+XN3NEtOuu1jm+/PKy1083RG8cqs7VfrS/QeOsvGt0 tnB0xNuA4SHMhcVC6DhxGZVgmUlb6lp2l8PRsyw4hN8xi8n7cknS/iFIEHTFnQOHANe4 +RTUvcJvXpD6lbWRDt37Q82xYxVnGp/0rHY2R6AI/NfcB1pZYzHuddswPazeX2/Q48pu /dM6oDRJiqFgbmz8NzDni8lUpxNXLxph4JG0H/G7ULoebjGeoduzIAsT6NW0EpY3j7BO gd+p3w395HNgK4Yucvc6FVIfml3wkTWeqbZUCF2k2T8vUOsBHeCY/6aVzEx9JMfCE+u4 VqFQ== X-Gm-Message-State: AOAM533zkw++thM8+hIt96fED8KxyZOXox4sTyi0riyFwNdIH621E34C Fc+fvcpTYOGNh2ul8sdUKgJuVQ== X-Google-Smtp-Source: ABdhPJwI1Kq04b+O688UugVzg1CfEU4CDqr4xxyhWdWZHbVmkszJgV9DrTUatEIxEWViofMYnwom9w== X-Received: by 2002:adf:d1ce:: with SMTP id b14mr20494459wrd.329.1613432084566; Mon, 15 Feb 2021 15:34:44 -0800 (PST) Received: from localhost.localdomain (2.0.5.1.1.6.3.8.5.c.c.3.f.b.d.3.0.0.0.0.6.1.f.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:df16:0:3dbf:3cc5:8361:1502]) by smtp.gmail.com with ESMTPSA id y16sm21691445wrw.46.2021.02.15.15.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 15:34:44 -0800 (PST) From: Phillip Potter To: gregkh@linuxfoundation.org Cc: ross.schm.dev@gmail.com, matthew.v.deangelis@gmail.com, pterjan@google.com, vkor@vkten.in, amarjargal16@gmail.com, foxhlchen@gmail.com, insafonov@gmail.com, yujian.wu1@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] staging: rtl8723bs: remove DBG_COUNTER calls from os_dep/xmit_linux.c Date: Mon, 15 Feb 2021 23:34:36 +0000 Message-Id: <20210215233440.80617-3-phil@philpotter.co.uk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210215233440.80617-2-phil@philpotter.co.uk> References: <20210215233440.80617-1-phil@philpotter.co.uk> <20210215233440.80617-2-phil@philpotter.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove all DBG_COUNTER macro calls from os_dep/xmit_linux.c, as the corresponding variables are only ever written to and not used. This makes the code cleaner, and is necessary prior to removing the DBG_COUNTER definition itself. Signed-off-by: Phillip Potter --- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c index b060a6a2df34..1c23fbe58881 100644 --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c @@ -139,8 +139,6 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) int i; s32 res; - DBG_COUNTER(padapter->tx_logs.os_tx_m2u); - spin_lock_bh(&pstapriv->asoc_list_lock); phead = &pstapriv->asoc_list; plist = get_next(phead); @@ -160,20 +158,14 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) for (i = 0; i < chk_alive_num; i++) { psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); - if (!(psta->state & _FW_LINKED)) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_ignore_fw_linked); + if (!(psta->state & _FW_LINKED)) continue; - } /* avoid come from STA1 and send back STA1 */ if (!memcmp(psta->hwaddr, &skb->data[6], 6) || !memcmp(psta->hwaddr, null_addr, 6) || - !memcmp(psta->hwaddr, bc_addr, 6)) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_ignore_self); + !memcmp(psta->hwaddr, bc_addr, 6)) continue; - } - - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry); newskb = rtw_skb_copy(skb); @@ -181,13 +173,11 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) memcpy(newskb->data, psta->hwaddr, 6); res = rtw_xmit(padapter, &newskb); if (res < 0) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_xmit); DBG_871X("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__); pxmitpriv->tx_drop++; dev_kfree_skb_any(newskb); } } else { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_skb); DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __func__, __LINE__); pxmitpriv->tx_drop++; /* dev_kfree_skb_any(skb); */ @@ -206,11 +196,9 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) struct mlme_priv *pmlmepriv = &padapter->mlmepriv; s32 res = 0; - DBG_COUNTER(padapter->tx_logs.os_tx); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); if (rtw_if_up(padapter) == false) { - DBG_COUNTER(padapter->tx_logs.os_tx_err_up); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); #ifdef DBG_TX_DROP_FRAME DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__); @@ -236,7 +224,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) } else { /* DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); */ /* DBG_871X("!m2u); */ - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_stop); } } -- 2.29.2 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 91946C433E0 for ; Mon, 15 Feb 2021 23:35:03 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 478E864DE8 for ; Mon, 15 Feb 2021 23:35:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 478E864DE8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=philpotter.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1C14E86A0F; Mon, 15 Feb 2021 23:35:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0H75JrPb1CUr; Mon, 15 Feb 2021 23:34:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6282C86BCB; Mon, 15 Feb 2021 23:34:56 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 082A51BF362 for ; Mon, 15 Feb 2021 23:34:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E88816F539 for ; Mon, 15 Feb 2021 23:34:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bIinZB3aXGBc for ; Mon, 15 Feb 2021 23:34:49 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id 3FEEB6F4E0; Mon, 15 Feb 2021 23:34:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by smtp3.osuosl.org (Postfix) with ESMTPS id 436C76F52C for ; Mon, 15 Feb 2021 23:34:46 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id v7so10987193wrr.12 for ; Mon, 15 Feb 2021 15:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BuvgedmN4/CYNm0K/K7y4QPZsyXKlASI/aChbguICAc=; b=qg3KfU/fc5L+Wdrpcg9GEtmscmWH81wBc1tvRfuoSc70Xk1pmoz3sgLUs5Ddo7MLTs gEEGDY9rzml32Yrzfk0cdqlzBMYl2GlILgrXgK5nZ51vyPJg/eFJ8CnzQNQ4vxuGJudu vN8zkLdX7eZ/YmyeAwCw/Ela5i3a5vnUM6282zI5vXlGrN1aj7lGJrSe+WyKSErqKD0z pM7vWp6VzW4nAD0v73TUfCNpEp7mJjY5jmsISDQQcwAbiAl4M4VsgiZp0jtTsF8Q+nzg 5+Kln8eHaoDzJcsofRZMaesaItTqZ7VjmEUlgMWpn5BarvEjWp82LfZzzNIL8VHPiUA7 fKWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BuvgedmN4/CYNm0K/K7y4QPZsyXKlASI/aChbguICAc=; b=skhyFGMTp23H82NZKRdzmHSTozKO/a9xYf71P1QEzUOOwWsCCQaN/gZGsAwWXfDZK6 4LXpdBWgP0WikhskqZbHDeuQeJeWVEPioGC5Q/RfdCfhMk16BkZ8L0KWbhsVYQ0DRMhY peGyOKiKMssLMLW2L+8zeG5sdCVNFphAzXbEWBDRE+YZoRxZnM/1xy80Onx18XJWItg4 hIyXfshkY9ozVTxjZTF65dD1468NfxiZenHXuBkOkiVJrikStjBmnOs1rk3ZOOUNM5YK GPr0N5jhOr1iTaH8nzADVkv4YUbVzjrMVhPIzILrIM76LBQue+hhbzMPtYg7XhVsF4De QPgw== X-Gm-Message-State: AOAM5303p8k62jqkBeYV1TEmiSDeJU11+Jhtro5a1PmQObQ2XaW1L7Ab 4psPxJe9x2+JYJwnFtcXaXvB7g== X-Google-Smtp-Source: ABdhPJwI1Kq04b+O688UugVzg1CfEU4CDqr4xxyhWdWZHbVmkszJgV9DrTUatEIxEWViofMYnwom9w== X-Received: by 2002:adf:d1ce:: with SMTP id b14mr20494459wrd.329.1613432084566; Mon, 15 Feb 2021 15:34:44 -0800 (PST) Received: from localhost.localdomain (2.0.5.1.1.6.3.8.5.c.c.3.f.b.d.3.0.0.0.0.6.1.f.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:df16:0:3dbf:3cc5:8361:1502]) by smtp.gmail.com with ESMTPSA id y16sm21691445wrw.46.2021.02.15.15.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 15:34:44 -0800 (PST) From: Phillip Potter To: gregkh@linuxfoundation.org Subject: [PATCH 2/6] staging: rtl8723bs: remove DBG_COUNTER calls from os_dep/xmit_linux.c Date: Mon, 15 Feb 2021 23:34:36 +0000 Message-Id: <20210215233440.80617-3-phil@philpotter.co.uk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210215233440.80617-2-phil@philpotter.co.uk> References: <20210215233440.80617-1-phil@philpotter.co.uk> <20210215233440.80617-2-phil@philpotter.co.uk> MIME-Version: 1.0 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, vkor@vkten.in, insafonov@gmail.com, foxhlchen@gmail.com, linux-kernel@vger.kernel.org, yujian.wu1@gmail.com, matthew.v.deangelis@gmail.com, amarjargal16@gmail.com, pterjan@google.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" Remove all DBG_COUNTER macro calls from os_dep/xmit_linux.c, as the corresponding variables are only ever written to and not used. This makes the code cleaner, and is necessary prior to removing the DBG_COUNTER definition itself. Signed-off-by: Phillip Potter --- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c index b060a6a2df34..1c23fbe58881 100644 --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c @@ -139,8 +139,6 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) int i; s32 res; - DBG_COUNTER(padapter->tx_logs.os_tx_m2u); - spin_lock_bh(&pstapriv->asoc_list_lock); phead = &pstapriv->asoc_list; plist = get_next(phead); @@ -160,20 +158,14 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) for (i = 0; i < chk_alive_num; i++) { psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); - if (!(psta->state & _FW_LINKED)) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_ignore_fw_linked); + if (!(psta->state & _FW_LINKED)) continue; - } /* avoid come from STA1 and send back STA1 */ if (!memcmp(psta->hwaddr, &skb->data[6], 6) || !memcmp(psta->hwaddr, null_addr, 6) || - !memcmp(psta->hwaddr, bc_addr, 6)) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_ignore_self); + !memcmp(psta->hwaddr, bc_addr, 6)) continue; - } - - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry); newskb = rtw_skb_copy(skb); @@ -181,13 +173,11 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) memcpy(newskb->data, psta->hwaddr, 6); res = rtw_xmit(padapter, &newskb); if (res < 0) { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_xmit); DBG_871X("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__); pxmitpriv->tx_drop++; dev_kfree_skb_any(newskb); } } else { - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_skb); DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __func__, __LINE__); pxmitpriv->tx_drop++; /* dev_kfree_skb_any(skb); */ @@ -206,11 +196,9 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) struct mlme_priv *pmlmepriv = &padapter->mlmepriv; s32 res = 0; - DBG_COUNTER(padapter->tx_logs.os_tx); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("+xmit_enry\n")); if (rtw_if_up(padapter) == false) { - DBG_COUNTER(padapter->tx_logs.os_tx_err_up); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); #ifdef DBG_TX_DROP_FRAME DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__); @@ -236,7 +224,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) } else { /* DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); */ /* DBG_871X("!m2u); */ - DBG_COUNTER(padapter->tx_logs.os_tx_m2u_stop); } } -- 2.29.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel