Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1162901pxf; Fri, 2 Apr 2021 03:03:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0Ym9uoYSQkhUsXyHiRi88ISibi1CsQLfMijGXhvInb4J1BDEhhJhqXWnnUGE82JZfeITK X-Received: by 2002:a17:906:2bc3:: with SMTP id n3mr13293232ejg.418.1617357789282; Fri, 02 Apr 2021 03:03:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617357789; cv=none; d=google.com; s=arc-20160816; b=vxKY1n/ArrjhbNC3yyT/t/fFz6Vo8EXUscJwYCnDNOM8yaxeGhyqiPLnIKiDxVi8rM B76ItK144BOpK0c76SB+oJnj0MYPPqoH5TEBsazCuAH1SO2GPUaPoXPydy7WwIM5U+EC Ofhnrp6scU0z6D6pWeWnwNRFx/QfxMfVamgA5VIJD3VfYyQXi2WEM4EdHyyAOvYrMgk5 84ejgqiKqgzYpORDH1diYXLAzt2f37xIXkv66sD3ArJaPrfBeUNtgzSs+QgRjRyBEfed qv4EGVOvOxVqZ4HZkUCPSfS23Quv/UtQYzA9Ueb5LdfOL7qlq3YSPnS0x2pb/bsRzdAG WoHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OUO9JNZeZiEcMuWnDvHXtbUZDg6fifPASZ5lLJXcld4=; b=QnQJu1MjQUr1t3awcWi5Za1aRkGOGYnDJJnBfW7DD4rbqCuy47bRppZYAQZl0mLjC8 DT1yyUYX5iXkHGdZVN599Vd7bStboDOJQDp8/M6mSOrnpsx7DGTocNEXBKJL4lxKcbHs TsPbGpUB0tdTL1Y4dbIKr/77o8/IpImB8aYAWBq+VpT5y6zVHMIRCEBizVj9MsBtvqjx xiuCRuSHBZWwBPf2pm1uAGAuQDPIxXUzCD/cedqokixwxpUOf1MmLGmkf/WHR8nrkL/n iH0/pgBARpJK6P4P79a3RoL8jFVvzf02dm70HMYqvDJrTbOV5O1WFqsNlu4tbREVKHn3 HbEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EeR6v2q2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si6988585edq.36.2021.04.02.03.02.41; Fri, 02 Apr 2021 03:03:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EeR6v2q2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234763AbhDBKB6 (ORCPT + 99 others); Fri, 2 Apr 2021 06:01:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234687AbhDBKB4 (ORCPT ); Fri, 2 Apr 2021 06:01:56 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CE27C0613E6 for ; Fri, 2 Apr 2021 03:01:54 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id u17so487600ejk.2 for ; Fri, 02 Apr 2021 03:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OUO9JNZeZiEcMuWnDvHXtbUZDg6fifPASZ5lLJXcld4=; b=EeR6v2q2tX+EIykQG/zVehUpXHCcjcHVgb015fJj+ne111yGRR3Dn6ONxH8abAYNHO u2sN620ngtKR8TPmIv+/1RcZ6W37ZAX0cv6jJRnTaIm2J5gysPAiwKWPYVnsFSAFveDy gcMBVRxxn7aiuvFEbF8sm0VPpliXZcpr96YOprNzTtHQ+dMDXzxxEgvjX6TXzzHK1jyo WaURjaxDsLc89OVyhmLuZy0NNOYYRor6R15vvqfGY2b9cV83isJaGqNwx8A6Cqf0kEtL U5c/yJLPFEFHijI3g23taO1zC2WCjl4THYeUojK+eRoptSOMdReg6rtVMMLMkqFkvgEl D5LA== 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=OUO9JNZeZiEcMuWnDvHXtbUZDg6fifPASZ5lLJXcld4=; b=ceHkmTwZekctxE2yFp+RHU5F9S15GxMLOOj7kwaFW1LwL6+ME2WeXZk+0BCoDohYnu /JpXWr7tn7o6FwuWz4ygQeggwSPfSGWD8WGdYQkO+qhdSeNpnMh2fAmb1WqBwMPVgGln DoVK6KRFzhE5HupL0gMWLFFiYQCXnlk+HrF+R0uPAseUpg4cpEFGKr7hEIv1ct0+tpPS +nr1HjKOWLiOItu1rHecmrh0dtEDD5ZXCdzMvL8RJxNVn5kx6kMGj1lznN+gZpiBcWq8 GtcNwEPemClLsSHPzM2rdv98UtLK2uS0D6p+6fY6wODCSojHCGRJGYs7wbfOLX/9Cyyg 0Vng== X-Gm-Message-State: AOAM530q4ZPqlPT81kw7ESgrolFlfv5zld2fIsgxJMhemN4SY21Z/hrz DPSua/Uv0sBajuhhfwixyK4+Z7s9ank= X-Received: by 2002:a17:907:3f96:: with SMTP id hr22mr13045054ejc.427.1617357713319; Fri, 02 Apr 2021 03:01:53 -0700 (PDT) Received: from agape ([5.171.72.128]) by smtp.gmail.com with ESMTPSA id x17sm3952481ejd.68.2021.04.02.03.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 03:01:52 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: dan.carpenter@oracle.com, joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Fabio Aiuto Subject: [PATCH 04/16] staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_pwrctrl.c Date: Fri, 2 Apr 2021 12:01:24 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove all RT_TRACE logs Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 60 ++------------------ 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index 8bf80e6f4a11..a3751d80704c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -266,41 +266,25 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv) if (pwrpriv->brpwmtimeout) { DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv); } else { - if ((pwrpriv->rpwm == pslv) - || ((pwrpriv->rpwm >= PS_STATE_S2) && (pslv >= PS_STATE_S2))) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: Already set rpwm[0x%02X], new = 0x%02X!\n", __func__, pwrpriv->rpwm, pslv)); + if (pwrpriv->rpwm == pslv || + (pwrpriv->rpwm >= PS_STATE_S2 && pslv >= PS_STATE_S2)) return; - } + } if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", - __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed)); - pwrpriv->cpwm = PS_STATE_S4; return; } - if (padapter->bDriverStopped) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv)); - - if (pslv < PS_STATE_S2) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", __func__, pslv)); - return; - } - } + if (padapter->bDriverStopped && pslv < PS_STATE_S2) + return; rpwm = pslv | pwrpriv->tog; /* only when from PS_STATE S0/S1 to S2 and higher needs ACK */ if ((pwrpriv->cpwm < PS_STATE_S2) && (pslv >= PS_STATE_S2)) rpwm |= PS_ACK; - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("rtw_set_rpwm: rpwm = 0x%02x cpwm = 0x%02x\n", rpwm, pwrpriv->cpwm)); pwrpriv->rpwm = pslv; @@ -382,14 +366,8 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: PowerMode =%d Smart_PS =%d\n", - __func__, ps_mode, smart_ps)); - - if (ps_mode > PM_Card_Disable) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("ps_mode:%d error\n", ps_mode)); + if (ps_mode > PM_Card_Disable) return; - } if (pwrpriv->pwr_mode == ps_mode) if (PS_MODE_ACTIVE == ps_mode) @@ -701,8 +679,6 @@ void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportp exit: mutex_unlock(&pwrpriv->lock); - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("cpwm_int_hdl: cpwm = 0x%02x\n", pwrpriv->cpwm)); } static void cpwm_event_callback(struct work_struct *work) @@ -817,10 +793,6 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task) register_task_alive(pwrctrl, task); if (pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: task = 0x%x cpwm = 0x%02x alives = 0x%08x\n", - __func__, task, pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm < pslv) { if (pwrctrl->cpwm < PS_STATE_S2) res = _FAIL; @@ -869,10 +841,6 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task) unregister_task_alive(pwrctrl, task); if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n", - __func__, pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm > pslv) if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) rtw_set_rpwm(padapter, pslv); @@ -910,10 +878,6 @@ s32 rtw_register_tx_alive(struct adapter *padapter) register_task_alive(pwrctrl, XMIT_ALIVE); if (pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("rtw_register_tx_alive: cpwm = 0x%02x alives = 0x%08x\n", - pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm < pslv) { if (pwrctrl->cpwm < PS_STATE_S2) res = _FAIL; @@ -959,10 +923,6 @@ s32 rtw_register_cmd_alive(struct adapter *padapter) register_task_alive(pwrctrl, CMD_ALIVE); if (pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, - ("rtw_register_cmd_alive: cpwm = 0x%02x alives = 0x%08x\n", - pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm < pslv) { if (pwrctrl->cpwm < PS_STATE_S2) res = _FAIL; @@ -1008,10 +968,6 @@ void rtw_unregister_tx_alive(struct adapter *padapter) unregister_task_alive(pwrctrl, XMIT_ALIVE); if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n", - __func__, pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm > pslv) if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) rtw_set_rpwm(padapter, pslv); @@ -1048,10 +1004,6 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) unregister_task_alive(pwrctrl, CMD_ALIVE); if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) { - RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, - ("%s: cpwm = 0x%02x alives = 0x%08x\n", - __func__, pwrctrl->cpwm, pwrctrl->alives)); - if (pwrctrl->cpwm > pslv) { if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0)) rtw_set_rpwm(padapter, pslv); -- 2.20.1