From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E277C6FA82 for ; Sat, 17 Sep 2022 04:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbiIQEZZ (ORCPT ); Sat, 17 Sep 2022 00:25:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiIQEZP (ORCPT ); Sat, 17 Sep 2022 00:25:15 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 033FC7F256 for ; Fri, 16 Sep 2022 21:25:11 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id e18so34186422edj.3 for ; Fri, 16 Sep 2022 21:25:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=rhTLpkykF4OIBIAgt6GfJteNOLtelxdClp8gG/XYfIU=; b=LUr4ht16I3o7wvdeRweapl2G61E7DGkQchVXPNMhb6xfp7pwYN4NqQKJXK8QAV5RFd ON9GylEMCYc8vpiu1K16lL0zEeoKiPZQwXLlRDPmTHUY2EnmFbuQ0JvJy990vzxirfLN 87QkeJuRJRn2L4213RYJ7DW0WzDm8FmGd7r3t9nhTL/cQXoLx2uFEbPcQpv0GJQHagOd ddkp0sjhfbE9ZtmvQp+L6AmfEoDKjEGwJcLgWCFwYQpngbYw4Bl5xJYHnw3pInLV/LiF L/6wWOTe4MDlhmeHRkCWT5jnfgG+a2kAVyQ6NSXTIvcwAYXaIevEZs261gck76jvxwnI hJjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=rhTLpkykF4OIBIAgt6GfJteNOLtelxdClp8gG/XYfIU=; b=Ves2XxOpYxSVBoegeJvay/I5EKWmfZWZXxlG6KQwABUxWAIs67XZ6I3pETE0JVAPZ1 6kWyLZiIWG6smjdgDy7bcIBso1fPCvKoqIkjSSjscBTcrnTsvge4HEXUO9X0/fruRRZ6 Gl/Mbi/Qo4v6ag/av/KQc/IUuuv2nNTHVvOexgibqT5KCO903IxsJ5WcblwvUQ3ZEXoZ KyjhSiA0ifuGJltUPvXAAxVw695+viMh5DVnOM4dzGExi3OZxWTgujD9/t4LVuL0rTe5 MjOYT59e5cIIE/TlY5Fn2S4GbNs/sHwEGTzhaox5vGuE7xYvqSmiFz5rx8xIQPAF1u4X cSUg== X-Gm-Message-State: ACrzQf2ZjnmzLDTsKvxh+LwWSdxX/1QU57yFtLAEJ45zXeYkFn+nqDLg wy5+oxQFFUrOmbX3ZVW6Yf5taBNyFh8= X-Google-Smtp-Source: AMsMyM6XW+83/ogTlj/dVpFegiV7H0eKgs4+XcF+rz4bT6Qggu3WWo5GfzqdUrA3MrQNLrjg7neAEw== X-Received: by 2002:a05:6402:2789:b0:451:a578:74dd with SMTP id b9-20020a056402278900b00451a57874ddmr6547860ede.72.1663388710111; Fri, 16 Sep 2022 21:25:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id e19-20020a50ec93000000b004528a535b44sm7435052edr.32.2022.09.16.21.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:25:09 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:07 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] staging: rtl8192e: Remove ftrace-like logging in r8192E_firmware.c, ... Message-ID: <370f47919a69f2f1717f50123c1617cabc78ceca.1663387785.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 ------ .../staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 -- .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 16 ---------------- drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 -------- 7 files changed, 42 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index 4abec7b42993..956e8e2a728c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -115,10 +115,6 @@ bool rtl92e_config_rf(struct net_device *dev) (enum rf90_radio_path)eRFPath, RegOffSetToBeCheck, bMask12Bits); - RT_TRACE(COMP_RF, - "RF %d %d register final value: %x\n", - eRFPath, RegOffSetToBeCheck, - RF3_Final_Value); RetryTimes--; } =20 @@ -142,8 +138,6 @@ bool rtl92e_config_rf(struct net_device *dev) goto fail; } } - - RT_TRACE(COMP_PHY, "PHY Initialization Success\n"); return true; =20 fail: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/st= aging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index cd8bbc358d01..df6e1043fe19 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -21,8 +21,6 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type= , const void *data, =20 struct tx_fwinfo_8190pci *pTxFwInfo =3D NULL; =20 - RT_TRACE(COMP_CMDPKT, "%s(),buffer_len is %d\n", __func__, len); - do { if ((len - frag_offset) > CMDPACKET_FRAG_SIZE) { frag_length =3D CMDPACKET_FRAG_SIZE; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/= staging/rtl8192e/rtl8192e/r8192E_firmware.c index 38110fa4f36d..789d288d7503 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -77,10 +77,6 @@ static bool _rtl92e_fw_check_ready(struct net_device *de= v, rt_status =3D _rtl92e_wait_for_fw(dev, CPU_GEN_FIRM_RDY, 20); if (rt_status) pfirmware->status =3D FW_STATUS_5_READY; - else - RT_TRACE(COMP_FIRMWARE, - "_rtl92e_is_fw_ready fail(%d)!\n", - rt_status); break; default: rt_status =3D false; @@ -149,9 +145,6 @@ bool rtl92e_init_fw(struct net_device *dev) } else if (pfirmware->status =3D=3D FW_STATUS_5_READY) { rst_opt =3D OPT_FIRMWARE_RESET; starting_state =3D FW_INIT_STEP2_DATA; - } else { - RT_TRACE(COMP_FIRMWARE, - "PlatformInitFirmware: undefined firmware state\n"); } =20 for (i =3D starting_state; i <=3D FW_INIT_STEP2_DATA; i++) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 6b372b0dd6bc..8dba8606bda1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -46,10 +46,6 @@ void rtl92e_enable_hw_security_config(struct net_device = *dev) ieee->hwsec_active =3D 0; SECR_value &=3D ~SCR_RxDecEnable; } - - RT_TRACE(COMP_SEC, "%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", - __func__, ieee->hwsec_active, ieee->pairwise_key_type, - SECR_value); rtl92e_writeb(dev, SECR, SECR_value); } =20 @@ -60,10 +56,6 @@ void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo= , u8 KeyIndex, struct r8192_priv *priv =3D rtllib_priv(dev); struct rtllib_device *ieee =3D priv->rtllib; =20 - RT_TRACE(COMP_DBG, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s():EntryNo is %d,KeyIndex is %d,Ke= yType is %d,is_mesh is %d\n", - __func__, EntryNo, KeyIndex, KeyType, is_mesh); - if (EntryNo >=3D TOTAL_CAM_ENTRY) return; =20 @@ -107,10 +99,6 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo,= u8 KeyIndex, return; } =20 - RT_TRACE(COMP_SEC, - "=3D=3D=3D=3D>to %s, dev:%p, EntryNo:%d, KeyIndex:%d,KeyType:%d, MacAdd= r %pM\n", - __func__, dev, EntryNo, KeyIndex, KeyType, MacAddr); - if (DefaultKey) usConfig |=3D BIT15 | (KeyType<<2); else @@ -144,7 +132,6 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo,= u8 KeyIndex, } } } - RT_TRACE(COMP_SEC, "=3D=3D=3D=3D=3D=3D=3D=3D=3D>after set key, usconfig:%= x\n", usConfig); } =20 void rtl92e_cam_restore(struct net_device *dev) @@ -163,9 +150,6 @@ void rtl92e_cam_restore(struct net_device *dev) 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; =20 - RT_TRACE(COMP_SEC, "%s:\n", __func__); - - if ((priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_WEP40) || (priv->rtllib->pairwise_key_type =3D=3D KEY_TYPE_WEP104)) { =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_pci.c index 1d992d5c4e17..886bf4ba2adf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c @@ -20,8 +20,6 @@ static void _rtl92e_parse_pci_configuration(struct pci_de= v *pdev, =20 pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &LinkCtrlReg); =20 - RT_TRACE(COMP_INIT, "Link Control Register =3D%x\n", LinkCtrlReg); - pci_read_config_byte(pdev, 0x98, &tmp); tmp |=3D BIT4; pci_write_config_byte(pdev, 0x98, tmp); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_pm.c index 5575186caebd..ced00de89114 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c @@ -86,7 +86,6 @@ int rtl92e_resume(struct device *dev_d) rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_INIT); =20 out: - RT_TRACE(COMP_POWER, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3Dr8= 192E resume call.\n"); return 0; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index ab0bd12ddfda..bfb963768fc3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -149,8 +149,6 @@ static int _rtl92e_wx_force_reset(struct net_device *de= v, =20 mutex_lock(&priv->wx_mutex); =20 - RT_TRACE(COMP_DBG, "%s(): force reset ! extra is %d\n", - __func__, *extra); priv->force_reset =3D *extra; mutex_unlock(&priv->wx_mutex); return 0; @@ -167,8 +165,6 @@ static int _rtl92e_wx_adapter_power_status(struct net_d= evice *dev, =20 mutex_lock(&priv->wx_mutex); =20 - RT_TRACE(COMP_POWER, "%s(): %s\n", __func__, (*extra =3D=3D 6) ? - "DC power" : "AC power"); if (*extra || priv->force_lps) { priv->ps_force =3D false; pPSC->bLeisurePs =3D true; @@ -427,9 +423,6 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, mutex_unlock(&priv->wx_mutex); return -1; } - RT_TRACE(COMP_PS, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s(): rtl92e_ips_leave\n", - __func__); mutex_lock(&priv->rtllib->ips_mutex); rtl92e_ips_leave(dev); mutex_unlock(&priv->rtllib->ips_mutex); @@ -681,7 +674,6 @@ static int _rtl92e_wx_set_enc(struct net_device *dev, mutex_unlock(&priv->rtllib->ips_mutex); mutex_lock(&priv->wx_mutex); =20 - RT_TRACE(COMP_SEC, "Setting SW wep key"); ret =3D rtllib_wx_set_encode(priv->rtllib, info, wrqu, key); mutex_unlock(&priv->wx_mutex); =20 --=20 2.37.3 From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCC70C6FA82 for ; Sat, 17 Sep 2022 04:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229743AbiIQEZk (ORCPT ); Sat, 17 Sep 2022 00:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbiIQEZa (ORCPT ); Sat, 17 Sep 2022 00:25:30 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12ACD7FF92 for ; Fri, 16 Sep 2022 21:25:28 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a26so24778201ejc.4 for ; Fri, 16 Sep 2022 21:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=Dzu/JwSGOZqPvNidvpwXW1mcinQ+25pDmoY3rOtbTQQ=; b=T2ouHS9gsO64LtVG6VoaIXBgUWLaFN88qP3rbq8NiICS7UgKvgCQPWOmrAEIhn2Yri SXf+NBSsCnuyZ/f6Ieu0UPW4aPLF8xuahcjAjkznp88CID5abkiZwOn35I8fwfVswL+Z sJLO+3ArTW2ZidG48BV6Mf2DAzKKm/MHTh9PLAprQXrzAEWGPLmGKNixHbJNHEoF+s3n 7554eFe5l1HAJYkgbct/x2pKO8+Ukqc4S3L8HKVp/ZZRjZUdxLclxQd24WRjJcpnDrDp z5s3eknA8gv7Og41UO+1OmWi7/bo+wKVa3oIg1LofKkEb6YERK9vHtYYf8cANhlcrgkw fD0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=Dzu/JwSGOZqPvNidvpwXW1mcinQ+25pDmoY3rOtbTQQ=; b=adK+5G+G0Bi4Kw5CF+kqk2HN2cvNNHY4YN6TgnYNg+kCqlTf71yOsWTP2WYNMrrs/5 w/pDXtWbNXqeVy8DkZDi7gwi33GwjIUxD0bEeIENqFNUfPy7K+wLC3OcwZq4oVrF8qTh umQK25mVx8RZMKe2IL4lo1czCAUGLd36eBdAazOKx65nVLKDJkhT+4cCToZugAgq9pSk qKCIebNzO1cynGqxtXht5aZzwj6SVijR50Y30yqXgZtSZCffSicim6k8Kg9k5q7qtwc8 FNIGNPFcOOpcsUQNLPZEH/aNsMsBtKCdA7VOFWpVHIuSyIIOiVDLu+2OceL5v6qhlEtD p6jw== X-Gm-Message-State: ACrzQf0EDp3JYvGpnZa8uuxR3i4nT8M74hLElkSSeLnmrMlrFoz/xqIt lNL+MuAwxD0oJ6+gAMztHYedRU570Gc= X-Google-Smtp-Source: AMsMyM61s94Da5wHrrq61H6S/L5IjQ6TnHxWK8IbkyATf0VdSn5Pqd8qhCGm8h8LAQun+3CF7ArsGA== X-Received: by 2002:a17:906:5a4d:b0:76f:bb35:48f4 with SMTP id my13-20020a1709065a4d00b0076fbb3548f4mr5329223ejc.686.1663388726214; Fri, 16 Sep 2022 21:25:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id s19-20020a1709062ed300b0073c10031dc9sm11301533eji.80.2022.09.16.21.25.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:25:25 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:23 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] staging: rtl8192e: Remove ftrace-like logging in r8192E_dev.c Message-ID: <425e1b015c34ddb6df425bc516df64c40a70a58a.1663387785.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 161 +----------------- 1 file changed, 1 insertion(+), 160 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 4b9249195b5a..5832ccdb4e50 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -186,8 +186,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable= , u8 *val) AC_PARAM_ECW_MIN_OFFSET) | (((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET); =20 - RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n", - __func__, eACI, u4bAcParam); switch (eACI) { case AC1_BK: rtl92e_writel(dev, EDCAPARA_BK, u4bAcParam); @@ -226,8 +224,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable= , u8 *val) u8 acm =3D pAciAifsn->f.acm; u8 AcmCtrl =3D rtl92e_readb(dev, AcmHwCtrl); =20 - RT_TRACE(COMP_DBG, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s():HW_VAR_ACM_CT= RL:%x\n", - __func__, eACI); AcmCtrl =3D AcmCtrl | ((priv->AcmMethod =3D=3D 2) ? 0x0 : 0x1); =20 if (acm) { @@ -243,12 +239,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variabl= e, u8 *val) case AC3_VO: AcmCtrl |=3D AcmHw_VoqEn; break; - - default: - RT_TRACE(COMP_QOS, - "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n", - eACI); - break; } } else { switch (eACI) { @@ -268,10 +258,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variabl= e, u8 *val) break; } } - - RT_TRACE(COMP_QOS, - "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", - AcmCtrl); rtl92e_writeb(dev, AcmHwCtrl, AcmCtrl); break; } @@ -304,8 +290,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) u16 i, usValue, IC_Version; u16 EEPROMId; =20 - RT_TRACE(COMP_INIT, "=3D=3D=3D=3D> %s\n", __func__); - EEPROMId =3D rtl92e_eeprom_read(dev, 0); if (EEPROMId !=3D RTL8190_EEPROM_ID) { netdev_err(dev, "%s(): Invalid EEPROM ID: %x\n", __func__, @@ -329,8 +313,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) =20 ICVer8192 =3D IC_Version & 0xf; ICVer8256 =3D (IC_Version & 0xf0)>>4; - RT_TRACE(COMP_INIT, "\nICVer8192 =3D 0x%x\n", ICVer8192); - RT_TRACE(COMP_INIT, "\nICVer8256 =3D 0x%x\n", ICVer8256); if (ICVer8192 =3D=3D 0x2) { if (ICVer8256 =3D=3D 0x5) priv->card_8192_version =3D VERSION_8190_BE; @@ -343,22 +325,14 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) priv->card_8192_version =3D VERSION_8190_BD; break; } - RT_TRACE(COMP_INIT, "\nIC Version =3D 0x%x\n", - priv->card_8192_version); } else { priv->card_8192_version =3D VERSION_8190_BD; priv->eeprom_vid =3D 0; priv->eeprom_did =3D 0; priv->eeprom_CustomerID =3D 0; priv->eeprom_ChannelPlan =3D 0; - RT_TRACE(COMP_INIT, "\nIC Version =3D 0x%x\n", 0xff); } =20 - RT_TRACE(COMP_INIT, "EEPROM VID =3D 0x%4x\n", priv->eeprom_vid); - RT_TRACE(COMP_INIT, "EEPROM DID =3D 0x%4x\n", priv->eeprom_did); - RT_TRACE(COMP_INIT, "EEPROM Customer ID: 0x%2x\n", - priv->eeprom_CustomerID); - if (!priv->AutoloadFailFlag) { u8 addr[ETH_ALEN]; =20 @@ -372,9 +346,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) eth_hw_addr_set(dev, bMac_Tmp_Addr); } =20 - RT_TRACE(COMP_INIT, "Permanent Address =3D %pM\n", - dev->dev_addr); - if (priv->card_8192_version > VERSION_8190_BD) priv->bTXPowerDataReadFromEEPORM =3D true; else @@ -395,8 +366,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) } else { priv->EEPROMLegacyHTTxPowerDiff =3D 0x04; } - RT_TRACE(COMP_INIT, "EEPROMLegacyHTTxPowerDiff =3D %d\n", - priv->EEPROMLegacyHTTxPowerDiff); =20 if (!priv->AutoloadFailFlag) priv->EEPROMThermalMeter =3D ((rtl92e_eeprom_read(dev, @@ -404,8 +373,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) 0xff00) >> 8; else priv->EEPROMThermalMeter =3D EEPROM_Default_ThermalMeter; - RT_TRACE(COMP_INIT, "ThermalMeter =3D %d\n", - priv->EEPROMThermalMeter); priv->TSSI_13dBm =3D priv->EEPROMThermalMeter * 100; =20 if (priv->epromtype =3D=3D EEPROM_93C46) { @@ -421,10 +388,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) priv->EEPROMCrystalCap =3D EEPROM_Default_TxPwDiff_CrystalCap; } - RT_TRACE(COMP_INIT, "EEPROMAntPwDiff =3D %d\n", - priv->EEPROMAntPwDiff); - RT_TRACE(COMP_INIT, "EEPROMCrystalCap =3D %d\n", - priv->EEPROMCrystalCap); =20 for (i =3D 0; i < 14; i +=3D 2) { if (!priv->AutoloadFailFlag) @@ -434,12 +397,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) usValue =3D EEPROM_Default_TxPower; *((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) =3D usValue; - RT_TRACE(COMP_INIT, - "CCK Tx Power Level, Index %d =3D 0x%02x\n", - i, priv->EEPROMTxPowerLevelCCK[i]); - RT_TRACE(COMP_INIT, - "CCK Tx Power Level, Index %d =3D 0x%02x\n", - i+1, priv->EEPROMTxPowerLevelCCK[i+1]); } for (i =3D 0; i < 14; i +=3D 2) { if (!priv->AutoloadFailFlag) @@ -449,13 +406,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) usValue =3D EEPROM_Default_TxPower; *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i])) =3D usValue; - RT_TRACE(COMP_INIT, - "OFDM 2.4G Tx Power Level, Index %d =3D 0x%02x\n", - i, priv->EEPROMTxPowerLevelOFDM24G[i]); - RT_TRACE(COMP_INIT, - "OFDM 2.4G Tx Power Level, Index %d =3D 0x%02x\n", - i + 1, - priv->EEPROMTxPowerLevelOFDM24G[i+1]); } } if (priv->epromtype =3D=3D EEPROM_93C46) { @@ -508,22 +458,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) priv->TxPowerLevelOFDM24G_C[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } - for (i =3D 0; i < 14; i++) - RT_TRACE(COMP_INIT, - "priv->TxPowerLevelCCK_A[%d] =3D 0x%x\n", - i, priv->TxPowerLevelCCK_A[i]); - for (i =3D 0; i < 14; i++) - RT_TRACE(COMP_INIT, - "priv->TxPowerLevelOFDM24G_A[%d] =3D 0x%x\n", - i, priv->TxPowerLevelOFDM24G_A[i]); - for (i =3D 0; i < 14; i++) - RT_TRACE(COMP_INIT, - "priv->TxPowerLevelCCK_C[%d] =3D 0x%x\n", - i, priv->TxPowerLevelCCK_C[i]); - for (i =3D 0; i < 14; i++) - RT_TRACE(COMP_INIT, - "priv->TxPowerLevelOFDM24G_C[%d] =3D 0x%x\n", - i, priv->TxPowerLevelOFDM24G_C[i]); priv->LegacyHTTxPowerDiff =3D priv->EEPROMLegacyHTTxPowerDiff; priv->AntennaTxPwDiff[0] =3D 0; @@ -536,13 +470,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) } } =20 - if (priv->rf_type =3D=3D RF_1T2R) { - /* no matter what checkpatch says, the braces are needed */ - RT_TRACE(COMP_INIT, "\n1T2R config\n"); - } else if (priv->rf_type =3D=3D RF_2T4R) { - RT_TRACE(COMP_INIT, "\n2T4R config\n"); - } - rtl92e_init_adaptive_rate(dev); =20 priv->rf_chip =3D RF_8256; @@ -574,8 +501,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->ChannelPlan =3D priv->eeprom_ChannelPlan&0x7f; else priv->ChannelPlan =3D 0x0; - RT_TRACE(COMP_INIT, "Toshiba ChannelPlan =3D 0x%x\n", - priv->ChannelPlan); break; case EEPROM_CID_Nettronix: priv->ScanDelay =3D 100; @@ -602,10 +527,6 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) priv->rtllib->bSupportRemoteWakeUp =3D true; else priv->rtllib->bSupportRemoteWakeUp =3D false; - - RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan); - RT_TRACE(COMP_INIT, "ChannelPlan =3D %d\n", priv->ChannelPlan); - RT_TRACE(COMP_TRACE, "<=3D=3D=3D=3D ReadAdapterInfo\n"); } =20 void rtl92e_get_eeprom_size(struct net_device *dev) @@ -613,14 +534,9 @@ void rtl92e_get_eeprom_size(struct net_device *dev) u16 curCR; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_INIT, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s()\n", __func__); curCR =3D rtl92e_readw(dev, EPROM_CMD); - RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD, - curCR); priv->epromtype =3D (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 : EEPROM_93C46; - RT_TRACE(COMP_INIT, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D%s(), epromtype:%d= \n", __func__, - priv->epromtype); _rtl92e_read_eeprom_info(dev); } =20 @@ -697,7 +613,6 @@ bool rtl92e_start_adapter(struct net_device *dev) int i =3D 0; u32 retry_times =3D 0; =20 - RT_TRACE(COMP_INIT, "=3D=3D=3D=3D>%s()\n", __func__); priv->being_init_adapter =3D true; =20 start: @@ -732,13 +647,11 @@ bool rtl92e_start_adapter(struct net_device *dev) rtl92e_writeb(dev, SWREGULATOR, 0xb8); } } - RT_TRACE(COMP_INIT, "BB Config Start!\n"); rtStatus =3D rtl92e_config_bb(dev); if (!rtStatus) { netdev_warn(dev, "%s(): Failed to configure BB\n", __func__); return rtStatus; } - RT_TRACE(COMP_INIT, "BB Config Finished!\n"); =20 priv->LoopbackMode =3D RTL819X_NO_LOOPBACK; if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { @@ -818,19 +731,7 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 tmpvalue =3D rtl92e_readb(dev, IC_VERRSION); priv->IC_Cut =3D tmpvalue; - RT_TRACE(COMP_INIT, "priv->IC_Cut=3D 0x%x\n", priv->IC_Cut); - if (priv->IC_Cut >=3D IC_VersionCut_D) { - if (priv->IC_Cut =3D=3D IC_VersionCut_D) { - /* no matter what checkpatch says, braces are needed */ - RT_TRACE(COMP_INIT, "D-cut\n"); - } else if (priv->IC_Cut =3D=3D IC_VersionCut_E) { - RT_TRACE(COMP_INIT, "E-cut\n"); - } - } else { - RT_TRACE(COMP_INIT, "Before C-cut\n"); - } =20 - RT_TRACE(COMP_INIT, "Load Firmware!\n"); bfirmwareok =3D rtl92e_init_fw(dev); if (!bfirmwareok) { if (retry_times < 10) { @@ -841,15 +742,13 @@ bool rtl92e_start_adapter(struct net_device *dev) goto end; } } - RT_TRACE(COMP_INIT, "Load Firmware finished!\n"); + if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { - RT_TRACE(COMP_INIT, "RF Config Started!\n"); rtStatus =3D rtl92e_config_phy(dev); if (!rtStatus) { netdev_info(dev, "RF Config failed\n"); return rtStatus; } - RT_TRACE(COMP_INIT, "RF Config Finished!\n"); } =20 rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn, 0x1); @@ -858,23 +757,12 @@ bool rtl92e_start_adapter(struct net_device *dev) rtl92e_writeb(dev, 0x87, 0x0); =20 if (priv->RegRfOff) { - RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER), - "%s(): Turn off RF for RegRfOff ----------\n", - __func__); rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW); } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) { - RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), - "%s(): Turn off RF for RfOffReason(%d) ----------\n", - __func__, priv->rtllib->RfOffReason); rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason); } else if (priv->rtllib->RfOffReason >=3D RF_CHANGE_BY_IPS) { - RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), - "%s(): Turn off RF for RfOffReason(%d) ----------\n", - __func__, priv->rtllib->RfOffReason); rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason); } else { - RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON\n", - __func__); priv->rtllib->eRFPowerState =3D eRfOn; priv->rtllib->RfOffReason =3D 0; } @@ -915,18 +803,6 @@ bool rtl92e_start_adapter(struct net_device *dev) priv->CCKPresentAttentuation_difference =3D 0; priv->CCKPresentAttentuation =3D priv->CCKPresentAttentuation_20Mdefault; - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex_initial =3D %d\n", - priv->rfa_txpowertrackingindex); - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex_real__initial =3D %d\n", - priv->rfa_txpowertrackingindex_real); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation_difference_initial =3D %d\n", - priv->CCKPresentAttentuation_difference); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation_initial =3D %d\n", - priv->CCKPresentAttentuation); priv->btxpower_tracking =3D false; } } @@ -1237,7 +1113,6 @@ void rtl92e_fill_tx_desc(struct net_device *dev, str= uct tx_desc *pdesc, static u8 tmp; =20 if (!tmp) { - RT_TRACE(COMP_DBG, "=3D=3D>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3Dhw sec\n"); tmp =3D 1; } switch (priv->rtllib->pairwise_key_type) { @@ -1350,12 +1225,6 @@ static u8 _rtl92e_rate_hw_to_mgn(bool bIsHT, u8 rate) case DESC90_RATE54M: ret_rate =3D MGN_54M; break; - - default: - RT_TRACE(COMP_RECV, - "%s: Non supportedRate [%x], bIsHT =3D %d!!!\n", - __func__, rate, bIsHT); - break; } =20 } else { @@ -1411,12 +1280,6 @@ static u8 _rtl92e_rate_hw_to_mgn(bool bIsHT, u8 rate) case DESC90_RATEMCS32: ret_rate =3D 0x80 | 0x20; break; - - default: - RT_TRACE(COMP_RECV, - "%s: Non supported Rate [%x], bIsHT =3D %d!!!\n", - __func__, rate, bIsHT); - break; } } =20 @@ -1721,9 +1584,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv= *priv, u8 *buffer, for (rfpath =3D RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) { if (!rtl92e_is_legal_rf_path(priv->rtllib->dev, rfpath)) continue; - RT_TRACE(COMP_DBG, - "Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] =3D %d\n", - prev_st->RxMIMOSignalStrength[rfpath]); if (priv->stats.rx_rssi_percentage[rfpath] =3D=3D 0) { priv->stats.rx_rssi_percentage[rfpath] =3D prev_st->RxMIMOSignalStrength[rfpath]; @@ -1745,9 +1605,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv= *priv, u8 *buffer, (prev_st->RxMIMOSignalStrength[rfpath])) / (RX_SMOOTH); } - RT_TRACE(COMP_DBG, - "Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] =3D %d\n", - priv->stats.rx_rssi_percentage[rfpath]); } } =20 @@ -1772,11 +1629,6 @@ static void _rtl92e_process_phyinfo(struct r8192_pri= v *priv, u8 *buffer, if (prev_st->RxPWDBAll >=3D 3) prev_st->RxPWDBAll -=3D 3; } - - RT_TRACE(COMP_RXDESC, "Smooth %s PWDB =3D %d\n", - prev_st->bIsCCK ? "CCK" : "OFDM", - prev_st->RxPWDBAll); - if (prev_st->bPacketToSelf || prev_st->bPacketBeacon || prev_st->bToSelfBA) { if (priv->undecorated_smoothed_pwdb < 0) @@ -2052,11 +1904,6 @@ bool rtl92e_get_rx_stats(struct net_device *dev, str= uct rtllib_rx_stats *stats, stats->RxIs40MHzPacket =3D pDrvInfo->BW; =20 _rtl92e_translate_rx_signal_stats(dev, skb, stats, pdesc, pDrvInfo); - - if (pDrvInfo->FirstAGGR =3D=3D 1 || pDrvInfo->PartAggr =3D=3D 1) - RT_TRACE(COMP_RXDESC, - "pDrvInfo->FirstAGGR =3D %d, pDrvInfo->PartAggr =3D %d\n", - pDrvInfo->FirstAGGR, pDrvInfo->PartAggr); skb_trim(skb, skb->len - 4/*sCrcLng*/); =20 =20 @@ -2261,9 +2108,6 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) u8 i; u8 SilentResetRxSoltNum =3D 4; =20 - RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d, RxCounter is %d\n", - __func__, RegRxCounter, priv->RxCounter); - rx_chk_cnt++; if (priv->undecorated_smoothed_pwdb >=3D (RateAdaptiveTH_High+5)) { rx_chk_cnt =3D 0; @@ -2321,9 +2165,6 @@ bool rtl92e_is_tx_stuck(struct net_device *dev) bool bStuck =3D false; u16 RegTxCounter =3D rtl92e_readw(dev, 0x128); =20 - RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", - __func__, RegTxCounter, priv->TxCounter); - if (priv->TxCounter =3D=3D RegTxCounter) bStuck =3D true; =20 --=20 2.37.3 From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13AB5ECAAD3 for ; Sat, 17 Sep 2022 04:25:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229678AbiIQEZ4 (ORCPT ); Sat, 17 Sep 2022 00:25:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbiIQEZi (ORCPT ); Sat, 17 Sep 2022 00:25:38 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39C7C98A7C for ; Fri, 16 Sep 2022 21:25:35 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id y3so53558574ejc.1 for ; Fri, 16 Sep 2022 21:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=tMHw0bxiz6QFlmLnskahqo5U4mVjc6Q9TyqyNWew0Mg=; b=dCD9xLVCdbXKPOjhYqGUKg+70zBzSibpHKEkfUhN1TYDxqvBZ2wFcatAM+PI4R2fFh xID8fd1uU8lTEscFPor2mjB9PxAnsvTQo0Q7E/VTZXYJl9s58/XfkssdINvL+poE/CW7 G0ZAu5JHGhmE+y9nYMSFCfF5dQkYjqW05Jub5rNTgf/MsoSWOSI5ojkwdlQIu2jd8mem SwrpooQE9mwjcnU8QW3bjQlUhHgTRyXt1RyOCLBs8Ejd9L0Jk6THKt77Sgd+9dbwug8B MOorNPnYh7eIcawyJjifY1u1TiVQ/DTc2yfPudocq8klegAaRkYkT/iNsVa+c4fkDBVI AjKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=tMHw0bxiz6QFlmLnskahqo5U4mVjc6Q9TyqyNWew0Mg=; b=m4WtUyQozgsfAUAoi9m6uTs037XWTFhDE4hF5s4EScv3wQtJe6WFz0A8Q8/Wu92ktx vQvOH+7q4sFZA0ErxGic9FNcYXDbPvaCv121RfhygnzOkzy2GY4vceltvBSJR/NzSwuw XAyCvVa8r32OlrOt0PUqn/KyzOjtRm7dWckn+Ol7dYM4QSUCbgNd9mMyAm7ZrJgCGoYh 5o8GburIXRS/jZL7hDXcMpvkuZUs1hoCspoo2MVS+YNrpNsFbIQiYa80qevvfa8UvocY 6pgIQbqUDTJkn3h/uqBLwoJhyfDdPFwRccISHHq415r14HMASxNXOlbfm1sPw79h3XN8 PuMQ== X-Gm-Message-State: ACrzQf3osOoj4WsJ+bPdqRnmXBq//ifwaq7gJ7Q8izCWvU9IDQnxpNYo hoXBZfP3/QaqK0uKskYj0Yg= X-Google-Smtp-Source: AMsMyM76j6vr4WNDtQX8CXQ+NE0dLFuhZwXntKScdlFNtiM29k4sWYt+d3u2trknGG2HM0n6VveiIg== X-Received: by 2002:a17:906:4787:b0:780:eca1:b5c3 with SMTP id cw7-20020a170906478700b00780eca1b5c3mr355017ejc.92.1663388734106; Fri, 16 Sep 2022 21:25:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id d12-20020a170906304c00b007807e4f6b30sm2605318ejd.103.2022.09.16.21.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:25:33 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] staging: rtl8192e: Remove ftrace-like logging in r8192E_phy.c Message-ID: <7315b22f54d62c5b56e8b9284426eca4cb641f77.1663387785.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 132 ------------------ 1 file changed, 132 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index f92551094738..d1c4d44bfc87 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -117,8 +117,6 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, } else NewOffset =3D Offset; } else { - RT_TRACE((COMP_PHY|COMP_ERR), - "check RF type here, need to be 8256\n"); NewOffset =3D Offset; } rtl92e_set_bb_reg(dev, pPhyReg->rfHSSIPara2, bLSSIReadAddress, @@ -173,8 +171,6 @@ static void _rtl92e_phy_rf_write(struct net_device *dev, } else NewOffset =3D Offset; } else { - RT_TRACE((COMP_PHY|COMP_ERR), - "check RF type here, need to be 8256\n"); NewOffset =3D Offset; } =20 @@ -207,7 +203,6 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf9= 0_radio_path eRFPath, if (priv->rtllib->eRFPowerState !=3D eRfOn && !priv->being_init_adapter) return; =20 - RT_TRACE(COMP_PHY, "FW RF CTRL is not ready now\n"); if (priv->Rf_Mode =3D=3D RF_OP_By_FW) { if (BitMask !=3D bMask12Bits) { Original_Value =3D _rtl92e_phy_rf_fw_read(dev, eRFPath, @@ -312,19 +307,14 @@ void rtl92e_config_mac(struct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 if (priv->bTXPowerDataReadFromEEPORM) { - RT_TRACE(COMP_PHY, "Rtl819XMACPHY_Array_PG\n"); dwArrayLen =3D MACPHY_Array_PGLength; pdwArray =3D Rtl819XMACPHY_Array_PG; =20 } else { - RT_TRACE(COMP_PHY, "Read rtl819XMACPHY_Array\n"); dwArrayLen =3D MACPHY_ArrayLength; pdwArray =3D Rtl819XMACPHY_Array; } for (i =3D 0; i < dwArrayLen; i +=3D 3) { - RT_TRACE(COMP_DBG, - "The Rtl8190MACPHY_Array[0] is %x Rtl8190MACPHY_Array[1] is %x Rtl8190= MACPHY_Array[2] is %x\n", - pdwArray[i], pdwArray[i+1], pdwArray[i+2]); if (pdwArray[i] =3D=3D 0x318) pdwArray[i+2] =3D 0x00000800; rtl92e_set_bb_reg(dev, pdwArray[i], pdwArray[i+1], @@ -357,20 +347,12 @@ static void _rtl92e_phy_config_bb(struct net_device *= dev, u8 ConfigType) rtl92e_set_bb_reg(dev, Rtl819XPHY_REGArray_Table[i], bMaskDWord, Rtl819XPHY_REGArray_Table[i+1]); - RT_TRACE(COMP_DBG, - "i: %x, The Rtl819xUsbPHY_REGArray[0] is %x Rtl819xUsbPHY_REGArray[1]= is %x\n", - i, Rtl819XPHY_REGArray_Table[i], - Rtl819XPHY_REGArray_Table[i+1]); } } else if (ConfigType =3D=3D BaseBand_Config_AGC_TAB) { for (i =3D 0; i < AGCTAB_ArrayLen; i +=3D 2) { rtl92e_set_bb_reg(dev, Rtl819XAGCTAB_Array_Table[i], bMaskDWord, Rtl819XAGCTAB_Array_Table[i+1]); - RT_TRACE(COMP_DBG, - "i:%x, The rtl819XAGCTAB_Array[0] is %x rtl819XAGCTAB_Array[1] is %x\= n", - i, Rtl819XAGCTAB_Array_Table[i], - Rtl819XAGCTAB_Array_Table[i+1]); } } } @@ -478,8 +460,6 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enu= m hw90_block CheckBlock, WriteAddr[HW90_BLOCK_PHY0] =3D 0x900; WriteAddr[HW90_BLOCK_PHY1] =3D 0x800; WriteAddr[HW90_BLOCK_RF] =3D 0x3; - RT_TRACE(COMP_PHY, "=3D=3D=3D=3D=3D=3D=3D>%s(), CheckBlock:%d\n", __func_= _, - CheckBlock); =20 if (CheckBlock =3D=3D HW90_BLOCK_MAC) { netdev_warn(dev, "%s(): No checks available for MAC block.\n", @@ -543,9 +523,6 @@ static bool _rtl92e_bb_config_para_file(struct net_devi= ce *dev) (enum hw90_block)eCheckItem, (enum rf90_radio_path)0); if (!rtStatus) { - RT_TRACE((COMP_ERR | COMP_PHY), - "rtl92e_config_rf():Check PHY%d Fail!!\n", - eCheckItem-1); return rtStatus; } } @@ -602,15 +579,9 @@ void rtl92e_get_tx_power(struct net_device *dev) priv->DefaultInitialGain[1] =3D rtl92e_readb(dev, rOFDM0_XBAGCCore1); priv->DefaultInitialGain[2] =3D rtl92e_readb(dev, rOFDM0_XCAGCCore1); priv->DefaultInitialGain[3] =3D rtl92e_readb(dev, rOFDM0_XDAGCCore1); - RT_TRACE(COMP_INIT, - "Default initial gain (c50=3D0x%x, c58=3D0x%x, c60=3D0x%x, c68=3D0x%x)\= n", - priv->DefaultInitialGain[0], priv->DefaultInitialGain[1], - priv->DefaultInitialGain[2], priv->DefaultInitialGain[3]); =20 priv->framesync =3D rtl92e_readb(dev, rOFDM0_RxDetector3); priv->framesyncC34 =3D rtl92e_readl(dev, rOFDM0_RxDetector2); - RT_TRACE(COMP_INIT, "Default framesync (0x%x) =3D 0x%x\n", - rOFDM0_RxDetector3, priv->framesync); priv->SifsTime =3D rtl92e_readw(dev, SIFS); } =20 @@ -813,9 +784,6 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_de= vice *dev, u8 channel, struct sw_chnl_cmd *CurrentCmd =3D NULL; u8 eRFPath; =20 - RT_TRACE(COMP_TRACE, "=3D=3D=3D=3D>%s()=3D=3D=3D=3Dstage:%d, step:%d, cha= nnel:%d\n", - __func__, *stage, *step, channel); - if (!rtllib_legal_channel(priv->rtllib, channel)) { netdev_err(dev, "Invalid channel requested: %d\n", channel); return true; @@ -976,21 +944,13 @@ static void _rtl92e_phy_switch_channel_work_item(stru= ct net_device *dev) =20 struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_TRACE, "=3D=3D> SwChnlCallback819xUsbWorkItem()\n"); - - RT_TRACE(COMP_TRACE, "=3D=3D=3D=3D=3D>--%s(), set chan:%d, priv:%p\n", __= func__, - priv->chan, priv); - _rtl92e_phy_switch_channel(dev, priv->chan); - - RT_TRACE(COMP_TRACE, "<=3D=3D SwChnlCallback819xUsbWorkItem()\n"); } =20 u8 rtl92e_set_channel(struct net_device *dev, u8 channel) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_PHY, "=3D=3D=3D=3D=3D>%s()\n", __func__); if (!priv->up) { netdev_err(dev, "%s(): Driver is not initialized\n", __func__); return false; @@ -1060,10 +1020,6 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tss= i(struct net_device *dev) if (priv->CCKPresentAttentuation < 0) priv->CCKPresentAttentuation =3D 0; =20 - RT_TRACE(COMP_POWER_TRACKING, - "20M, priv->CCKPresentAttentuation =3D %d\n", - priv->CCKPresentAttentuation); - if (priv->rtllib->current_network.channel =3D=3D 14 && !priv->bcck_in_ch14) { priv->bcck_in_ch14 =3D true; @@ -1082,9 +1038,6 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi= (struct net_device *dev) priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; =20 - RT_TRACE(COMP_POWER_TRACKING, - "40M, priv->CCKPresentAttentuation =3D %d\n", - priv->CCKPresentAttentuation); if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength - 1)) priv->CCKPresentAttentuation =3D @@ -1123,16 +1076,10 @@ static void _rtl92e_cck_tx_power_track_bw_switch_th= ermal(struct net_device *dev) if (priv->Record_CCK_20Mindex =3D=3D 0) priv->Record_CCK_20Mindex =3D 6; priv->CCK_index =3D priv->Record_CCK_20Mindex; - RT_TRACE(COMP_POWER_TRACKING, - "20MHz, %s,CCK_index =3D %d\n", __func__, - priv->CCK_index); break; =20 case HT_CHANNEL_WIDTH_20_40: priv->CCK_index =3D priv->Record_CCK_40Mindex; - RT_TRACE(COMP_POWER_TRACKING, - "40MHz, %s, CCK_index =3D %d\n", __func__, - priv->CCK_index); break; } rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); @@ -1154,12 +1101,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net= _device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); u8 regBwOpMode; =20 - RT_TRACE(COMP_SWBW, - "=3D=3D>%s Switch to %s bandwidth\n", __func__, - priv->CurrentChannelBW =3D=3D HT_CHANNEL_WIDTH_20 ? - "20MHz" : "40MHz"); - - if (priv->rf_chip =3D=3D RF_PSEUDO_11N) { priv->SetBWModeInProgress =3D false; return; @@ -1251,8 +1192,6 @@ static void _rtl92e_set_bw_mode_work_item(struct net_= device *dev) =20 atomic_dec(&(priv->rtllib->atm_swbw)); priv->SetBWModeInProgress =3D false; - - RT_TRACE(COMP_SWBW, "<=3D=3DSetBWMode819xUsb()"); } =20 void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width Band= width, @@ -1291,8 +1230,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Oper= ation) if (priv->up) { switch (Operation) { case IG_Backup: - RT_TRACE(COMP_SCAN, - "IG_Backup, backup the initial gain.\n"); initial_gain =3D SCAN_RX_INITIAL_GAIN; BitMask =3D bMaskByte0; if (dm_digtable.dig_algorithm =3D=3D @@ -1314,35 +1251,13 @@ void rtl92e_init_gain(struct net_device *dev, u8 Op= eration) priv->initgain_backup.cca =3D (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, BitMask); =20 - RT_TRACE(COMP_SCAN, - "Scan InitialGainBackup 0xc50 is %x\n", - priv->initgain_backup.xaagccore1); - RT_TRACE(COMP_SCAN, - "Scan InitialGainBackup 0xc58 is %x\n", - priv->initgain_backup.xbagccore1); - RT_TRACE(COMP_SCAN, - "Scan InitialGainBackup 0xc60 is %x\n", - priv->initgain_backup.xcagccore1); - RT_TRACE(COMP_SCAN, - "Scan InitialGainBackup 0xc68 is %x\n", - priv->initgain_backup.xdagccore1); - RT_TRACE(COMP_SCAN, - "Scan InitialGainBackup 0xa0a is %x\n", - priv->initgain_backup.cca); - - RT_TRACE(COMP_SCAN, "Write scan initial gain =3D 0x%x\n", - initial_gain); rtl92e_writeb(dev, rOFDM0_XAAGCCore1, initial_gain); rtl92e_writeb(dev, rOFDM0_XBAGCCore1, initial_gain); rtl92e_writeb(dev, rOFDM0_XCAGCCore1, initial_gain); rtl92e_writeb(dev, rOFDM0_XDAGCCore1, initial_gain); - RT_TRACE(COMP_SCAN, "Write scan 0xa0a =3D 0x%x\n", - POWER_DETECTION_TH); rtl92e_writeb(dev, 0xa0a, POWER_DETECTION_TH); break; case IG_Restore: - RT_TRACE(COMP_SCAN, - "IG_Restore, restore the initial gain.\n"); BitMask =3D 0x7f; if (dm_digtable.dig_algorithm =3D=3D DIG_ALGO_BY_FALSE_ALARM) @@ -1360,22 +1275,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Ope= ration) rtl92e_set_bb_reg(dev, rCCK0_CCA, BitMask, (u32)priv->initgain_backup.cca); =20 - RT_TRACE(COMP_SCAN, - "Scan BBInitialGainRestore 0xc50 is %x\n", - priv->initgain_backup.xaagccore1); - RT_TRACE(COMP_SCAN, - "Scan BBInitialGainRestore 0xc58 is %x\n", - priv->initgain_backup.xbagccore1); - RT_TRACE(COMP_SCAN, - "Scan BBInitialGainRestore 0xc60 is %x\n", - priv->initgain_backup.xcagccore1); - RT_TRACE(COMP_SCAN, - "Scan BBInitialGainRestore 0xc68 is %x\n", - priv->initgain_backup.xdagccore1); - RT_TRACE(COMP_SCAN, - "Scan BBInitialGainRestore 0xa0a is %x\n", - priv->initgain_backup.cca); - rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel); =20 @@ -1383,9 +1282,6 @@ void rtl92e_init_gain(struct net_device *dev, u8 Oper= ation) DIG_ALGO_BY_FALSE_ALARM) rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); break; - default: - RT_TRACE(COMP_SCAN, "Unknown IG Operation.\n"); - break; } } } @@ -1416,14 +1312,12 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, =20 if (priv->SetRFPowerStateInProgress) return false; - RT_TRACE(COMP_PS, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D> %s!\n", __func__); priv->SetRFPowerStateInProgress =3D true; =20 switch (priv->rf_chip) { case RF_8256: switch (eRFPowerState) { case eRfOn: - RT_TRACE(COMP_PS, "%s eRfOn!\n", __func__); if ((priv->rtllib->eRFPowerState =3D=3D eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { bool rtstatus; @@ -1481,16 +1375,11 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, QueueID++; continue; } else { - RT_TRACE((COMP_POWER|COMP_RF), - "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=3D0 before doze!\n", - (i+1), QueueID); udelay(10); i++; } =20 if (i >=3D MAX_DOZE_WAITING_TIMES_9x) { - RT_TRACE(COMP_POWER, "\n\n\n TimeOut!! %s: eRfOff: %d times TcbBusyQu= eue[%d] !=3D 0 !!!\n", - __func__, MAX_DOZE_WAITING_TIMES_9x, QueueID); break; } } @@ -1498,8 +1387,6 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, break; =20 case eRfOff: - RT_TRACE(COMP_PS, "%s eRfOff/Sleep !\n", __func__); - for (QueueID =3D 0, i =3D 0; QueueID < MAX_TX_QUEUE; ) { ring =3D &priv->tx_ring[QueueID]; =20 @@ -1507,18 +1394,11 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, QueueID++; continue; } else { - RT_TRACE(COMP_POWER, - "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=3D0 before doze!\n", - (i+1), QueueID); udelay(10); i++; } =20 if (i >=3D MAX_DOZE_WAITING_TIMES_9x) { - RT_TRACE(COMP_POWER, - "\n\n\n SetZebra: RFPowerState8185B(): eRfOff: %d times TcbBusyQueu= e[%d] !=3D 0 !!!\n", - MAX_DOZE_WAITING_TIMES_9x, - QueueID); break; } } @@ -1563,7 +1443,6 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, } =20 priv->SetRFPowerStateInProgress =3D false; - RT_TRACE(COMP_PS, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D %s bResult =3D %d!\= n", __func__, bResult); return bResult; } =20 @@ -1574,19 +1453,12 @@ bool rtl92e_set_rf_power_state(struct net_device *d= ev, =20 bool bResult =3D false; =20 - RT_TRACE(COMP_PS, - "---------> %s: eRFPowerState(%d)\n", __func__, eRFPowerState); if (eRFPowerState =3D=3D priv->rtllib->eRFPowerState && priv->bHwRfOffAction =3D=3D 0) { - RT_TRACE(COMP_PS, "<--------- %s: discard the request for eRFPowerState(= %d) is the same.\n", - __func__, eRFPowerState); return bResult; } =20 bResult =3D _rtl92e_set_rf_power_state(dev, eRFPowerState); - - RT_TRACE(COMP_PS, "<--------- %s: bResult(%d)\n", __func__, bResult); - return bResult; } =20 @@ -1603,10 +1475,6 @@ void rtl92e_scan_op_backup(struct net_device *dev, u= 8 Operation) case SCAN_OPT_RESTORE: priv->rtllib->InitialGainHandler(dev, IG_Restore); break; - - default: - RT_TRACE(COMP_SCAN, "Unknown Scan Backup Operation.\n"); - break; } } } --=20 2.37.3 From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DA24C6FA8B for ; Sat, 17 Sep 2022 04:26:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229647AbiIQE0A (ORCPT ); Sat, 17 Sep 2022 00:26:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbiIQEZq (ORCPT ); Sat, 17 Sep 2022 00:25:46 -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 6C77BA74F5 for ; Fri, 16 Sep 2022 21:25:44 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id 13so24501047ejn.3 for ; Fri, 16 Sep 2022 21:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=VqhHMljAu1g+wJEyrHQ/EApSp/g9cqVTDobcVCKucEw=; b=S/ITtk/kUcYt+Hzp/FghonA+/KCyWnSUDXtE7AAnoADj1wMRjkBPtXhqc9wFDH5SSC w+nYfUWpqXMApvB7yyry2iQ6RUbQ3WEGu1+W4oUPdDa5oozGgATcDgoY3vp/hV1Q8tMV OCye+qICUXvD4uuyJf5D3iyRM2U+ot5BcufK5eBfIQq4GyRUYqg057lu1tr2EAiRwmTJ 5V78f36ZoFRwuSlGZn1M1zMGzThp+DFFMtZM9m3MViBIpRiPTd2C8KZjjXBrFqsyb6d5 ESfqgPlwfXMlruN1wUmPuuTRHYnMVLyZVnGy5BRbfNZ98pL4RiC4nkA1AsjZcaLbZRpm fN/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=VqhHMljAu1g+wJEyrHQ/EApSp/g9cqVTDobcVCKucEw=; b=CEYCJnnOXnVw56E5bKIXGRLIQmkbzwNbOcOLhNvCFAgGjRURf+EAOiKSBEeti+Zlx6 yPqh5+CFDiqi+WaPPzsxulTQh5MLEQCZ0WDuUW5MxtwYqinw/JgbY812a8p2hGVXa+Q1 Zie5bNvdWGEqA4jwhLtbl1doR0oXghyaUvaO70A9zRKLm3cPhgxAnGzz7Xx46CNWrziB O9bjZfP47l7qnemRe0p8srRCoCSu0+S/jJg7onWGUXIcP09WSXqKhibFtQYt0OK1L9Hh lub0bXoSEwOS15OeoZYIM9HL0IltojwwIszYOlTTymq/k6YbBgesAYTF+zUPQe2S3ZeA v+3w== X-Gm-Message-State: ACrzQf38BIz9S3Ww+EsOnT0qltYSDnmwT1ErcEimB/BgRfFBdVjQ16hg xKPUA4nRcSNFRbJvH1EsCJ4= X-Google-Smtp-Source: AMsMyM4TxqqojMZbf0FRtgj3oivhttDIZRVpH0bA+lqrWm/hIb6G7hTNkYd5x/UY+OsVbKJKVm6TRg== X-Received: by 2002:a17:907:3f12:b0:77b:8d8:f353 with SMTP id hq18-20020a1709073f1200b0077b08d8f353mr5477575ejc.349.1663388742807; Fri, 16 Sep 2022 21:25:42 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id w11-20020a056402128b00b0044e7adbe0c5sm14890745edv.87.2022.09.16.21.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:25:42 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:40 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] staging: rtl8192e: Remove ftrace-like logging in rtl_dm.c Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 165 --------------------- 1 file changed, 165 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 3ee52147960e..6d09b71d4993 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -268,8 +268,6 @@ static void _rtl92e_dm_check_ac_dc_power(struct net_dev= ice *dev) NULL}; =20 if (priv->ResetProgress =3D=3D RESET_TYPE_SILENT) { - RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF), - "GPIOChangeRFWorkItemCallBack(): Silent Reset!!!!!!!\n"); return; } =20 @@ -333,8 +331,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) static u8 ping_rssi_state; =20 if (!priv->up) { - RT_TRACE(COMP_RATE, - "<---- %s: driver is going to unload\n", __func__); return; } =20 @@ -423,9 +419,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) u32 ratr_value; =20 ratr_value =3D targetRATR; - RT_TRACE(COMP_RATE, - "currentRATR =3D %x, targetRATR =3D %x\n", - currentRATR, targetRATR); if (priv->rf_type =3D=3D RF_1T2R) ratr_value &=3D ~(RATE_ALL_OFDM_2SS); rtl92e_writel(dev, RATR0, ratr_value); @@ -628,7 +621,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(= struct net_device *dev) u16 Avg_TSSI_Meas, TSSI_13dBm, Avg_TSSI_Meas_from_driver =3D 0; u32 delta =3D 0; =20 - RT_TRACE(COMP_POWER_TRACKING, "%s()\n", __func__); rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); priv->rtllib->bdynamic_txpower_enable =3D false; @@ -637,10 +629,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi= (struct net_device *dev) RF_Type =3D priv->rf_type; Value =3D (RF_Type<<8) | powerlevelOFDM24G; =20 - RT_TRACE(COMP_POWER_TRACKING, "powerlevelOFDM24G =3D %x\n", - powerlevelOFDM24G); - - for (j =3D 0; j <=3D 30; j++) { =20 tx_cmd.Op =3D TXCMD_SET_TX_PWR_TRACKING; @@ -656,15 +644,11 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) mdelay(1); =20 if (priv->bResetInProgress) { - RT_TRACE(COMP_POWER_TRACKING, - "we are in silent reset progress, so return\n"); rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); return; } if (priv->rtllib->eRFPowerState !=3D eRfOn) { - RT_TRACE(COMP_POWER_TRACKING, - "we are in power save, so return\n"); rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); return; @@ -689,10 +673,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi= (struct net_device *dev) tmp_report[k] =3D rtl92e_readb(dev, Tssi_Report_Value2); =20 - RT_TRACE(COMP_POWER_TRACKING, - "TSSI_report_value =3D %d\n", - tmp_report[k]); - if (tmp_report[k] <=3D 20) { viviflag =3D true; break; @@ -702,8 +682,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(= struct net_device *dev) if (viviflag) { rtl92e_writeb(dev, Pw_Track_Flag, 0); viviflag =3D false; - RT_TRACE(COMP_POWER_TRACKING, - "we filted this data\n"); for (k =3D 0; k < 5; k++) tmp_report[k] =3D 0; break; @@ -713,12 +691,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi= (struct net_device *dev) Avg_TSSI_Meas_from_driver +=3D tmp_report[k]; =20 Avg_TSSI_Meas_from_driver *=3D 100 / 5; - RT_TRACE(COMP_POWER_TRACKING, - "Avg_TSSI_Meas_from_driver =3D %d\n", - Avg_TSSI_Meas_from_driver); TSSI_13dBm =3D priv->TSSI_13dBm; - RT_TRACE(COMP_POWER_TRACKING, "TSSI_13dBm =3D %d\n", - TSSI_13dBm); =20 if (Avg_TSSI_Meas_from_driver > TSSI_13dBm) delta =3D Avg_TSSI_Meas_from_driver - TSSI_13dBm; @@ -729,20 +702,6 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi= (struct net_device *dev) priv->rtllib->bdynamic_txpower_enable =3D true; rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); - RT_TRACE(COMP_POWER_TRACKING, - "tx power track is done\n"); - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex =3D %d\n", - priv->rfa_txpowertrackingindex); - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex_real =3D %d\n", - priv->rfa_txpowertrackingindex_real); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation_difference =3D %d\n", - priv->CCKPresentAttentuation_difference); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation =3D %d\n", - priv->CCKPresentAttentuation); return; } if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) @@ -785,26 +744,12 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) } else rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); } - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex =3D %d\n", - priv->rfa_txpowertrackingindex); - RT_TRACE(COMP_POWER_TRACKING, - "priv->rfa_txpowertrackingindex_real =3D %d\n", - priv->rfa_txpowertrackingindex_real); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation_difference =3D %d\n", - priv->CCKPresentAttentuation_difference); - RT_TRACE(COMP_POWER_TRACKING, - "priv->CCKPresentAttentuation =3D %d\n", - priv->CCKPresentAttentuation); =20 if (priv->CCKPresentAttentuation_difference <=3D -12 || priv->CCKPresentAttentuation_difference >=3D 24) { priv->rtllib->bdynamic_txpower_enable =3D true; rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); - RT_TRACE(COMP_POWER_TRACKING, - "tx power track--->limited\n"); return; } =20 @@ -834,10 +779,6 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(st= ruct net_device *dev) for (i =3D 0; i < OFDM_Table_Length; i++) { if (tmpRegA =3D=3D OFDMSwingTable[i]) { priv->OFDM_index[0] =3D i; - RT_TRACE(COMP_POWER_TRACKING, - "Initial reg0x%x =3D 0x%x, OFDM_index =3D 0x%x\n", - rOFDM0_XATxIQImbalance, tmpRegA, - priv->OFDM_index[0]); } } =20 @@ -845,10 +786,6 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(st= ruct net_device *dev) for (i =3D 0; i < CCK_Table_length; i++) { if (TempCCk =3D=3D (u32)CCKSwingTable_Ch1_Ch13[i][0]) { priv->CCK_index =3D i; - RT_TRACE(COMP_POWER_TRACKING, - "Initial reg0x%x =3D 0x%x, CCK_index =3D 0x%x\n", - rCCK0_TxFilter1, TempCCk, - priv->CCK_index); break; } } @@ -857,12 +794,10 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(s= truct net_device *dev) } =20 tmpRegA =3D rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078); - RT_TRACE(COMP_POWER_TRACKING, "Readback ThermalMeterA =3D %d\n", tmpRegA); if (tmpRegA < 3 || tmpRegA > 13) return; if (tmpRegA >=3D 12) tmpRegA =3D 12; - RT_TRACE(COMP_POWER_TRACKING, "Valid ThermalMeterA =3D %d\n", tmpRegA); priv->ThermalMeter[0] =3D ThermalMeterVal; priv->ThermalMeter[1] =3D ThermalMeterVal; =20 @@ -894,9 +829,6 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) =20 priv->Record_CCK_20Mindex =3D tmpCCK20Mindex; priv->Record_CCK_40Mindex =3D tmpCCK40Mindex; - RT_TRACE(COMP_POWER_TRACKING, - "Record_CCK_20Mindex / Record_CCK_40Mindex =3D %d / %d.\n", - priv->Record_CCK_20Mindex, priv->Record_CCK_40Mindex); =20 if (priv->rtllib->current_network.channel =3D=3D 14 && !priv->bcck_in_ch14) { @@ -919,9 +851,6 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) priv->OFDM_index[0] =3D tmpOFDMindex; rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, OFDMSwingTable[priv->OFDM_index[0]]); - RT_TRACE(COMP_POWER_TRACKING, "Update OFDMSwing[%d] =3D 0x%x\n", - priv->OFDM_index[0], - OFDMSwingTable[priv->OFDM_index[0]]); } priv->txpower_count =3D 0; } @@ -960,8 +889,6 @@ static void _rtl92e_dm_init_tx_power_tracking_thermal(s= truct net_device *dev) priv->btxpower_tracking =3D false; priv->txpower_count =3D 0; priv->btxpower_trackingInit =3D false; - RT_TRACE(COMP_POWER_TRACKING, "pMgntInfo->bTXPowerTracking =3D %d\n", - priv->btxpower_tracking); } =20 void rtl92e_dm_init_txpower_tracking(struct net_device *dev) @@ -979,7 +906,6 @@ static void _rtl92e_dm_check_tx_power_tracking_tssi(str= uct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); static u32 tx_power_track_counter; =20 - RT_TRACE(COMP_POWER_TRACKING, "%s()\n", __func__); if (rtl92e_readb(dev, 0x11e) =3D=3D 1) return; if (!priv->btxpower_tracking) @@ -1086,44 +1012,29 @@ static void _rtl92e_dm_cck_tx_power_adjust_thermal_= meter(struct net_device *dev, TempVal =3D CCKSwingTable_Ch1_Ch13[priv->CCK_index][0] + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1] << 8); rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, - "CCK not chnl 14, reg 0x%x =3D 0x%x\n", rCCK0_TxFilter1, - TempVal); TempVal =3D CCKSwingTable_Ch1_Ch13[priv->CCK_index][2] + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][3] << 8) + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][4] << 16)+ (CCKSwingTable_Ch1_Ch13[priv->CCK_index][5] << 24); rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, - "CCK not chnl 14, reg 0x%x =3D 0x%x\n", rCCK0_TxFilter2, - TempVal); TempVal =3D CCKSwingTable_Ch1_Ch13[priv->CCK_index][6] + (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7] << 8); =20 rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, - "CCK not chnl 14, reg 0x%x =3D 0x%x\n", rCCK0_DebugPort, - TempVal); } else { TempVal =3D CCKSwingTable_Ch14[priv->CCK_index][0] + (CCKSwingTable_Ch14[priv->CCK_index][1] << 8); =20 rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x =3D 0x%x\n", - rCCK0_TxFilter1, TempVal); TempVal =3D CCKSwingTable_Ch14[priv->CCK_index][2] + (CCKSwingTable_Ch14[priv->CCK_index][3] << 8) + (CCKSwingTable_Ch14[priv->CCK_index][4] << 16)+ (CCKSwingTable_Ch14[priv->CCK_index][5] << 24); rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x =3D 0x%x\n", - rCCK0_TxFilter2, TempVal); TempVal =3D CCKSwingTable_Ch14[priv->CCK_index][6] + (CCKSwingTable_Ch14[priv->CCK_index][7]<<8); =20 rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); - RT_TRACE(COMP_POWER_TRACKING, "CCK chnl 14, reg 0x%x =3D 0x%x\n", - rCCK0_DebugPort, TempVal); } } =20 @@ -1141,32 +1052,12 @@ static void _rtl92e_dm_tx_power_reset_recovery(stru= ct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_POWER_TRACKING, "Start Reset Recovery =3D=3D>\n"); rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, dm_tx_bb_gain[priv->rfa_txpowertrackingindex]); - RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc80 is %08x\n", - dm_tx_bb_gain[priv->rfa_txpowertrackingindex]); - RT_TRACE(COMP_POWER_TRACKING, - "Reset Recovery: Fill in RFA_txPowerTrackingIndex is %x\n", - priv->rfa_txpowertrackingindex); - RT_TRACE(COMP_POWER_TRACKING, - "Reset Recovery : RF A I/Q Amplify Gain is %d\n", - dm_tx_bb_gain_idx_to_amplify(priv->rfa_txpowertrackingindex)); - RT_TRACE(COMP_POWER_TRACKING, - "Reset Recovery: CCK Attenuation is %d dB\n", - priv->CCKPresentAttentuation); rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); =20 rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, dm_tx_bb_gain[priv->rfc_txpowertrackingindex]); - RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc90 is %08x\n", - dm_tx_bb_gain[priv->rfc_txpowertrackingindex]); - RT_TRACE(COMP_POWER_TRACKING, - "Reset Recovery: Fill in RFC_txPowerTrackingIndex is %x\n", - priv->rfc_txpowertrackingindex); - RT_TRACE(COMP_POWER_TRACKING, - "Reset Recovery : RF C I/Q Amplify Gain is %d\n", - dm_tx_bb_gain_idx_to_amplify(priv->rfc_txpowertrackingindex)); } =20 void rtl92e_dm_restore_state(struct net_device *dev) @@ -1176,8 +1067,6 @@ void rtl92e_dm_restore_state(struct net_device *dev) u32 ratr_value; =20 if (!priv->up) { - RT_TRACE(COMP_RATE, - "<---- %s: driver is going to unload\n", __func__); return; } =20 @@ -1218,17 +1107,6 @@ static void _rtl92e_dm_bb_initialgain_restore(struct= net_device *dev) bit_mask =3D bMaskByte2; rtl92e_set_bb_reg(dev, rCCK0_CCA, bit_mask, (u32)priv->initgain_backup.cca); - - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc50 is %x\n", - priv->initgain_backup.xaagccore1); - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc58 is %x\n", - priv->initgain_backup.xbagccore1); - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc60 is %x\n", - priv->initgain_backup.xcagccore1); - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xc68 is %x\n", - priv->initgain_backup.xdagccore1); - RT_TRACE(COMP_DIG, "dm_BBInitialGainRestore 0xa0a is %x\n", - priv->initgain_backup.cca); rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); =20 } @@ -1251,17 +1129,6 @@ void rtl92e_dm_backup_state(struct net_device *dev) priv->initgain_backup.xdagccore1 =3D rtl92e_get_bb_reg(dev, rOFDM0_XDAGCC= ore1, bit_mask); bit_mask =3D bMaskByte2; priv->initgain_backup.cca =3D (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_m= ask); - - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n", - priv->initgain_backup.xaagccore1); - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc58 is %x\n", - priv->initgain_backup.xbagccore1); - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc60 is %x\n", - priv->initgain_backup.xcagccore1); - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc68 is %x\n", - priv->initgain_backup.xdagccore1); - RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n", - priv->initgain_backup.cca); } =20 static void _rtl92e_dm_dig_init(struct net_device *dev) @@ -1820,12 +1687,10 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *dat= a) eRfPowerStateToSet =3D (tmp1byte&BIT1) ? eRfOn : eRfOff; =20 if (priv->hw_radio_off && (eRfPowerStateToSet =3D=3D eRfOn)) { - RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio ON\n"); netdev_info(dev, "gpiochangeRF - HW Radio ON\n"); priv->hw_radio_off =3D false; bActuallySet =3D true; } else if (!priv->hw_radio_off && (eRfPowerStateToSet =3D=3D eRfOff)) { - RT_TRACE(COMP_RF, "gpiochangeRF - HW Radio OFF\n"); netdev_info(dev, "gpiochangeRF - HW Radio OFF\n"); priv->hw_radio_off =3D true; bActuallySet =3D true; @@ -2173,10 +2038,6 @@ static void _rtl92e_dm_fsync_timer_callback(struct t= imer_list *t) } priv->rate_record =3D rate_count; priv->rateCountDiffRecord =3D rate_count_diff; - RT_TRACE(COMP_HALDM, - "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", - priv->rate_record, rate_count, rate_count_diff, - priv->bswitch_fsync); if (priv->undecorated_smoothed_pwdb > priv->rtllib->fsync_rssi_threshold && bSwitchFromCountDiff) { @@ -2220,11 +2081,6 @@ static void _rtl92e_dm_fsync_timer_callback(struct t= imer_list *t) priv->ContinueDiffCount =3D 0; rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd); } - RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount); - RT_TRACE(COMP_HALDM, - "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", - priv->rate_record, rate_count, rate_count_diff, - priv->bswitch_fsync); } =20 static void _rtl92e_dm_start_hw_fsync(struct net_device *dev) @@ -2232,7 +2088,6 @@ static void _rtl92e_dm_start_hw_fsync(struct net_devi= ce *dev) u8 rf_timing =3D 0x77; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_HALDM, "%s\n", __func__); rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c12cf); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8 *)(&rf_timing)); @@ -2244,7 +2099,6 @@ static void _rtl92e_dm_end_hw_fsync(struct net_device= *dev) u8 rf_timing =3D 0xaa; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_HALDM, "%s\n", __func__); rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd); priv->rtllib->SetHwRegHandler(dev, HW_VAR_RF_TIMING, (u8 *) (&rf_timing)); @@ -2255,7 +2109,6 @@ static void _rtl92e_dm_end_sw_fsync(struct net_device= *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_HALDM, "%s\n", __func__); del_timer_sync(&(priv->fsync_timer)); =20 if (priv->bswitch_fsync) { @@ -2276,7 +2129,6 @@ static void _rtl92e_dm_start_sw_fsync(struct net_devi= ce *dev) u32 rateIndex; u32 rateBitmap; =20 - RT_TRACE(COMP_HALDM, "%s\n", __func__); priv->rate_record =3D 0; priv->ContinueDiffCount =3D 0; priv->rateCountDiffRecord =3D 0; @@ -2315,17 +2167,6 @@ static void _rtl92e_dm_check_fsync(struct net_device= *dev) static u8 reg_c38_State =3D RegC38_Default; static u32 reset_cnt; =20 - RT_TRACE(COMP_HALDM, - "RSSI %d TimeInterval %d MultipleTimeInterval %d\n", - priv->rtllib->fsync_rssi_threshold, - priv->rtllib->fsync_time_interval, - priv->rtllib->fsync_multiple_timeinterval); - RT_TRACE(COMP_HALDM, - "RateBitmap 0x%x FirstDiffRateThreshold %d SecondDiffRateThreshold %d\n= ", - priv->rtllib->fsync_rate_bitmap, - priv->rtllib->fsync_firstdiff_ratethreshold, - priv->rtllib->fsync_seconddiff_ratethreshold); - if (priv->rtllib->state =3D=3D RTLLIB_LINKED && priv->rtllib->pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { if (priv->rtllib->bfsync_enable =3D=3D 0) { @@ -2461,9 +2302,6 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_de= vice *dev) txlowpower_threshold =3D TX_POWER_NEAR_FIELD_THRESH_LOW; } =20 - RT_TRACE(COMP_TXAGC, "priv->undecorated_smoothed_pwdb =3D %ld\n", - priv->undecorated_smoothed_pwdb); - if (priv->rtllib->state =3D=3D RTLLIB_LINKED) { if (priv->undecorated_smoothed_pwdb >=3D txhipower_threshold) { priv->bDynamicTxHighPower =3D true; @@ -2484,9 +2322,6 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_de= vice *dev) =20 if ((priv->bDynamicTxHighPower !=3D priv->bLastDTPFlag_High) || (priv->bDynamicTxLowPower !=3D priv->bLastDTPFlag_Low)) { - RT_TRACE(COMP_TXAGC, "SetTxPowerLevel8190() channel =3D %d\n", - priv->rtllib->current_network.channel); - rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel); } priv->bLastDTPFlag_High =3D priv->bDynamicTxHighPower; --=20 2.37.3 From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADED6C6FA82 for ; Sat, 17 Sep 2022 04:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229790AbiIQE0S (ORCPT ); Sat, 17 Sep 2022 00:26:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229681AbiIQEZy (ORCPT ); Sat, 17 Sep 2022 00:25:54 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E67F2A951 for ; Fri, 16 Sep 2022 21:25:51 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a26so24779302ejc.4 for ; Fri, 16 Sep 2022 21:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=P4IXbjpJGogB5bTg3j6LGjLbToM1KMQkj8lnneUfMDE=; b=NX8Ya4tB87jnzHdWuHENplKakLqBCRAgfp8c1MduGfLX4qWI5aM+Zxa8rReQkVw4UH 6hlTaK/zi5A23JCAx7hrYYCuvKtFf2UGBAiV3xhGB3E1RI3uQTzySmM+nJezDdvLPkS1 s5CxJak70R28Jbv4z5kOrHPsQ5XmZ3wTVQGOCL1SiqsN9LNXfHTrfeeaGOompCIxZUX+ +VnaZw6Lbl7nSoBQeI/5w0dO7HHm9vYwJ6fj2kDpCJcwL1dxBVfj1JFw3mK9tEoP2naa HGUZ5vT+5++Q8xxzvNhdK2wHrwK4ojhSA9ZGpCYjVkwlRciPrq3akt/6NjieAMrwVjcJ rWzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=P4IXbjpJGogB5bTg3j6LGjLbToM1KMQkj8lnneUfMDE=; b=ue6I+vTXiqejhKx221n6bnT+s16gpcefQO+f7n3qUuRu6DPjhf5l2UtEYtQ9schbDl RgB1jziMLHCko74jVFgQcCYf1Lzfa5kAY44nxlkEC9ehNHseTot+ph/Z+/A5TGXbmwIT YCSJxMto2gEeVggzjOttKLayNWffBaA4mKwuzfbTgycy4WDGbx85TnPHen1qpZ0bT8le GO7QJgf5tOiPU/UyNmb+aChBPF7Qcz8YmAYNoOyB9Z5CdXHgs53Har5cLKQCIRT5Dc83 C5vL4AhL8Ns584k9jX1k7Va5IUQ5pDPfvaMmR/+GCO1FANJVsiaUgujSfGVIi1O34SCM EZLQ== X-Gm-Message-State: ACrzQf06R/xjQb8W/5Eq4krZ4ian3buFFbL8rUOthwmxlxZ4EO8HkqXP mz/eGiTjYRwPmCihtB+44sa6+C46KVc= X-Google-Smtp-Source: AMsMyM7TWi7Pyw+NtYWXDQ0hRdHci6YAuF7Y7j81PkLYtxj2QlRD2YJMS7Dg5ZtYsN2zlzc2AdZWUA== X-Received: by 2002:a17:907:6ea2:b0:779:8fc1:e5d8 with SMTP id sh34-20020a1709076ea200b007798fc1e5d8mr5467127ejc.731.1663388751168; Fri, 16 Sep 2022 21:25:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id b2-20020a1709063ca200b00777249e951bsm11544672ejh.51.2022.09.16.21.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:25:50 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:48 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] staging: rtl8192e: Remove ftrace-like logging in rtl_ps.c Message-ID: <6d942ba65f62643af2ff7104911f7947cca21790.1663387785.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 966debd99296..d752bbc310d1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -23,13 +23,9 @@ static void _rtl92e_hw_sleep(struct net_device *dev) spin_lock_irqsave(&priv->rf_ps_lock, flags); if (priv->rf_change_in_progress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - RT_TRACE(COMP_DBG, - "%s(): RF Change in progress!\n", __func__); return; } spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - RT_TRACE(COMP_DBG, "%s()=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>come to slee= p down\n", __func__); - rtl92e_set_rf_state(dev, eRfSleep, RF_CHANGE_BY_PS); } =20 @@ -50,14 +46,11 @@ void rtl92e_hw_wakeup(struct net_device *dev) spin_lock_irqsave(&priv->rf_ps_lock, flags); if (priv->rf_change_in_progress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - RT_TRACE(COMP_DBG, - "%s(): RF Change in progress!\n", __func__); schedule_delayed_work(&priv->rtllib->hw_wakeup_wq, msecs_to_jiffies(10)); return; } spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - RT_TRACE(COMP_PS, "%s()=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>come to wake = up\n", __func__); rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_PS); } =20 @@ -110,15 +103,10 @@ static void _rtl92e_ps_update_rf_state(struct net_dev= ice *dev) struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) &(priv->rtllib->PowerSaveControl); =20 - RT_TRACE(COMP_PS, "%s() --------->\n", __func__); pPSC->bSwRfProcessing =3D true; - - RT_TRACE(COMP_PS, "%s(): Set RF to %s.\n", __func__, - pPSC->eInactivePowerState =3D=3D eRfOff ? "OFF" : "ON"); rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS); =20 pPSC->bSwRfProcessing =3D false; - RT_TRACE(COMP_PS, "%s() <---------\n", __func__); } =20 void rtl92e_ips_enter(struct net_device *dev) @@ -133,7 +121,6 @@ void rtl92e_ips_enter(struct net_device *dev) if (rt_state =3D=3D eRfOn && !pPSC->bSwRfProcessing && (priv->rtllib->state !=3D RTLLIB_LINKED) && (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { - RT_TRACE(COMP_PS, "%s(): Turn off RF.\n", __func__); pPSC->eInactivePowerState =3D eRfOff; priv->isRFOff =3D true; priv->bInPowerSaveMode =3D true; @@ -153,7 +140,6 @@ void rtl92e_ips_leave(struct net_device *dev) rt_state =3D priv->rtllib->eRFPowerState; if (rt_state !=3D eRfOn && !pPSC->bSwRfProcessing && priv->rtllib->RfOffReason <=3D RF_CHANGE_BY_IPS) { - RT_TRACE(COMP_PS, "%s(): Turn on RF.\n", __func__); pPSC->eInactivePowerState =3D eRfOn; priv->bInPowerSaveMode =3D false; _rtl92e_ps_update_rf_state(dev); @@ -210,7 +196,6 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev,= u8 rtPsMode) if (priv->rtllib->iw_mode =3D=3D IW_MODE_ADHOC) return false; =20 - RT_TRACE(COMP_LPS, "%s(): set ieee->ps =3D %x\n", __func__, rtPsMode); if (!priv->ps_force) priv->rtllib->ps =3D rtPsMode; if (priv->rtllib->sta_sleep !=3D LPS_IS_WAKE && @@ -221,8 +206,6 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev,= u8 rtPsMode) priv->rtllib->sta_sleep =3D LPS_IS_WAKE; =20 spin_lock_irqsave(&(priv->rtllib->mgmt_tx_lock), flags); - RT_TRACE(COMP_DBG, - "LPS leave: notify AP we are awaked ++++++++++ SendNullFunctionData\n"= ); rtllib_sta_ps_send_null_frame(priv->rtllib, 0); spin_unlock_irqrestore(&(priv->rtllib->mgmt_tx_lock), flags); } @@ -236,12 +219,6 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) &(priv->rtllib->PowerSaveControl); =20 - RT_TRACE(COMP_PS, "%s()...\n", __func__); - RT_TRACE(COMP_PS, - "pPSC->bLeisurePs =3D %d, ieee->ps =3D %d,pPSC->LpsIdleCount is %d,RT_C= HECK_FOR_HANG_PERIOD is %d\n", - pPSC->bLeisurePs, priv->rtllib->ps, pPSC->LpsIdleCount, - RT_CHECK_FOR_HANG_PERIOD); - if (!((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) && (priv->rtllib->state =3D=3D RTLLIB_LINKED)) || (priv->rtllib->iw_mode =3D=3D IW_MODE_ADHOC) || @@ -252,10 +229,6 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) if (pPSC->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { =20 if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) { - - RT_TRACE(COMP_LPS, - "%s(): Enter 802.11 power save mode...\n", __func__); - if (!pPSC->bFwCtrlLPS) { if (priv->rtllib->SetFwCmdHandler) priv->rtllib->SetFwCmdHandler( @@ -275,15 +248,8 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) &(priv->rtllib->PowerSaveControl); =20 - - RT_TRACE(COMP_PS, "%s()...\n", __func__); - RT_TRACE(COMP_PS, "pPSC->bLeisurePs =3D %d, ieee->ps =3D %d\n", - pPSC->bLeisurePs, priv->rtllib->ps); - if (pPSC->bLeisurePs) { if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { - RT_TRACE(COMP_LPS, - "%s(): Busy Traffic , Leave 802.11 power save..\n", __func__); _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); =20 if (!pPSC->bFwCtrlLPS) { --=20 2.37.3 From nobody Sun Apr 5 18:16:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61B2AC6FA82 for ; Sat, 17 Sep 2022 04:26:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbiIQE03 (ORCPT ); Sat, 17 Sep 2022 00:26:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbiIQE0F (ORCPT ); Sat, 17 Sep 2022 00:26:05 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D64156B92 for ; Fri, 16 Sep 2022 21:26:02 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id y17so48456260ejo.6 for ; Fri, 16 Sep 2022 21:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date; bh=48TrLh74HqKrzik8Fk6DUHkcVjt+dZhNAckkfUJzuE0=; b=nUG9lZNtYC0PSixanDyWQ01k0z7hFlVsMAq1nmESd0yXJUYonLPqfiwfr3RBLnddgp JKF+xomEA8Ni58wanXtGYMqBjruQeLpqQsRfqB8XIH4nF/d2ASIx4KOv7RziHH47E61K WquRHNnAxSoJCqbRAt36lS661wpczPCJredbxPnhJnvUQxgErIJW5bsh870/067DghUa RHZsgk2rHIYNGXuhfZba1CzyeXpC5BMGFvZ0aOL/M6hbVuDuuAUcQPoqLpC5lHsXYuEQ 7VEMVG+/rrDS3ZvYWRhNIcIA6HVsw6RVtwea+PrgMY+BY/LkMIY8SU/du/oME2pVweM/ SlCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=48TrLh74HqKrzik8Fk6DUHkcVjt+dZhNAckkfUJzuE0=; b=lZ3NFFD7IZjFzlDn6xjOctAxlSRjTcs6/exznNuzWlbrvOaQTExjgMoGdEqmki4FT1 xPtOColQkzhEizvQjpJj/swCZmJzLrBg9NZQN3V3YcIGJxqAvRPJsugulQxCHKv7vHbs myqVIkNffgrP33kGtdusEpqNF/kOs3o2Mg2vSBf+be216xBW/cF+lu8bpCBL0LXpajU/ cF2ls3I0LoYZAoVbJEk9/bRIrNYECGMAOIqNqN64PQaBFeKZRFPqZ1mBqcinGiiPQG2D 3MKAOrDaXXZT/X8BQZ/3XodUq5qiVX0Sa9f8kWkK4U1+9nQ6Wa/I3w8Acrnm3IPignAN OiHA== X-Gm-Message-State: ACrzQf1fXz8zsJD7jmNw7xeM6gfL8U5J5QVWJlFzW6THncI+DtF4bjwK 8AGlpjSTdqIfRnMtWnfUXIc= X-Google-Smtp-Source: AMsMyM7/YuX8xKItHriaHDm0U24H0J8mZmYHBA2MagMxvOVL2b+hd4tuQ/0WnQYLOl7tvrVZCAUpXw== X-Received: by 2002:a17:907:9718:b0:77b:45b6:b047 with SMTP id jg24-20020a170907971800b0077b45b6b047mr5605543ejc.479.1663388761412; Fri, 16 Sep 2022 21:26:01 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id b14-20020a17090630ce00b0073d7b876621sm2153632ejb.205.2022.09.16.21.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 21:26:00 -0700 (PDT) Date: Sat, 17 Sep 2022 06:25:58 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] staging: rtl8192e: Remove ftrace-like logging in rtl819x_BAProc.c, ... Message-ID: <2c41e6856cd37b4f3e5cb1108272bcc24032bf64.1663387785.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove "Unnecessary ftrace-like logging" as requested by checkpatch. Remove multiline macro as it is not needed anymore and not liked by kernel community. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 ----- drivers/staging/rtl8192e/rtllib_debug.h | 6 ------ drivers/staging/rtl8192e/rtllib_softmac.c | 8 -------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 ------ 4 files changed, 25 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 7d04966afdd9..4c907fb16253 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -100,8 +100,6 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_devic= e *ieee, u8 *Dst, *tag++ =3D pBA->dialog_token; =20 if (type =3D=3D ACT_ADDBARSP) { - RT_TRACE(COMP_DBG, "=3D=3D=3D=3D>to send ADDBARSP\n"); - put_unaligned_le16(StatusCode, tag); tag +=3D 2; } @@ -183,7 +181,6 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *= ieee, u8 *dst, skb =3D rtllib_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ); =20 if (skb) { - RT_TRACE(COMP_DBG, "=3D=3D=3D=3D>to send ADDBAREQ!!!!!\n"); softmac_mgmt_xmit(skb, ieee); } else { netdev_dbg(ieee->dev, "Failed to generate ADDBAReq packet.\n"); @@ -247,7 +244,6 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, stru= ct sk_buff *skb) pBaTimeoutVal =3D (u16 *)(tag + 5); pBaStartSeqCtrl =3D (union sequence_control *)(req + 7); =20 - RT_TRACE(COMP_DBG, "=3D=3D=3D=3D>rx ADDBAREQ from : %pM\n", dst); if (!ieee->current_network.qos_data.active || !ieee->pHTInfo->bCurrentHTSupport || (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) { @@ -330,7 +326,6 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, stru= ct sk_buff *skb) pBaParamSet =3D (union ba_param_set *)(tag + 5); pBaTimeoutVal =3D (u16 *)(tag + 7); =20 - RT_TRACE(COMP_DBG, "=3D=3D=3D=3D>rx ADDBARSP from : %pM\n", dst); if (!ieee->current_network.qos_data.active || !ieee->pHTInfo->bCurrentHTSupport || !ieee->pHTInfo->bCurrentAMPDUEnable) { diff --git a/drivers/staging/rtl8192e/rtllib_debug.h b/drivers/staging/rtl8= 192e/rtllib_debug.h index e3e8302945eb..f6b23defe225 100644 --- a/drivers/staging/rtl8192e/rtllib_debug.h +++ b/drivers/staging/rtl8192e/rtllib_debug.h @@ -46,10 +46,4 @@ enum RTL_DEBUG { COMP_ERR =3D BIT(31) }; =20 -#define RT_TRACE(component, x, args...) \ -do { \ - if (rt_global_debug_component & component) \ - printk(KERN_DEBUG DRV_NAME ":" x "\n", ##args);\ -} while (0) - #endif diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 9e6d7c5716ff..e4f5f4ecf4d0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1584,13 +1584,8 @@ static void rtllib_associate_procedure_wq(void *data) ieee->data_hard_stop(ieee->dev); =20 rtllib_stop_scan(ieee); - RT_TRACE(COMP_DBG, "=3D=3D=3D>%s(), chan:%d\n", __func__, - ieee->current_network.channel); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); if (ieee->eRFPowerState =3D=3D eRfOff) { - RT_TRACE(COMP_DBG, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s():Rf state is eRfOff, sche= dule ipsleave wq again,return\n", - __func__); if (ieee->rtllib_ips_leave_wq !=3D NULL) ieee->rtllib_ips_leave_wq(ieee->dev); mutex_unlock(&ieee->wx_mutex); @@ -2062,9 +2057,6 @@ static inline void rtllib_sta_ps(struct work_struct *= work) if ((ieee->ps =3D=3D RTLLIB_PS_DISABLED || ieee->iw_mode !=3D IW_MODE_INFRA || ieee->state !=3D RTLLIB_LINKED)) { - RT_TRACE(COMP_DBG, - "=3D=3D=3D=3D=3D>%s(): no need to ps,wake up!! ieee->ps is %d, ieee->i= w_mode is %d, ieee->state is %d\n", - __func__, ieee->ps, ieee->iw_mode, ieee->state); spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); rtllib_sta_wakeup(ieee, 1); =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 70a62ca0f69a..f9589c5b62ba 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -364,8 +364,6 @@ void rtllib_wx_sync_scan_wq(void *data) b40M =3D 1; chan_offset =3D ieee->pHTInfo->CurSTAExtChnlOffset; bandwidth =3D (enum ht_channel_width)ieee->pHTInfo->bCurBW40MHz; - RT_TRACE(COMP_DBG, "Scan in 40M, force to 20M first:%d, %d\n", - chan_offset, bandwidth); ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); } @@ -373,7 +371,6 @@ void rtllib_wx_sync_scan_wq(void *data) rtllib_start_scan_syncro(ieee, 0); =20 if (b40M) { - RT_TRACE(COMP_DBG, "Scan in 20M, back to 40M\n"); if (chan_offset =3D=3D HT_EXTCHNL_OFFSET_UPPER) ieee->set_chan(ieee->dev, chan + 2); else if (chan_offset =3D=3D HT_EXTCHNL_OFFSET_LOWER) @@ -571,14 +568,11 @@ int rtllib_wx_set_power(struct rtllib_device *ieee, mutex_lock(&ieee->wx_mutex); =20 if (wrqu->power.disabled) { - RT_TRACE(COMP_DBG, "=3D=3D=3D>%s(): power disable\n", __func__); ieee->ps =3D RTLLIB_PS_DISABLED; goto exit; } if (wrqu->power.flags & IW_POWER_TIMEOUT) { ieee->ps_timeout =3D wrqu->power.value / 1000; - RT_TRACE(COMP_DBG, "=3D=3D=3D>%s():ps_timeout is %d\n", __func__, - ieee->ps_timeout); } =20 if (wrqu->power.flags & IW_POWER_PERIOD) --=20 2.37.3