From nobody Mon Feb 9 04:30:34 2026 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618323088; cv=none; d=zohomail.com; s=zohoarc; b=giHHKqAqiLTeiLLADR/6Sn8MFX02rfMouNXDiyeeJdoiBkxZ5Dkf49JjLnj+/LK+nehcekyKXo/eTbZ1O0kO/QIIX0GkvOUPxoVU39niB7mTiudRcz61S9Bx99KPmdetGeWPXJI2Gvy1h/lRKBV6/Pu4DwlY1c/Rwpj9H0DSwTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618323088; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=jSEnliZNTsHjR6wKzUjuLn3oIHLdeYnyhs9bbaWyIUA=; b=ONZLn9QrlINE6+JRUQq4PAou+d/psDFhfcjRcCTO7mM/6b4NElFQI0oToxUaVYcXttYogcNKX35zYoW5c16ES2kk7mvipP9c0BIYLb3loLMobLQ18/tZ4MXZjEtHK6bYMFJUzFwI0RAnGtTgCsOf2wbSitCBLWzE3CIH1fr9l/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1618323088094200.31262874246931; Tue, 13 Apr 2021 07:11:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346323AbhDMOL1 (ORCPT ); Tue, 13 Apr 2021 10:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231978AbhDMOLN (ORCPT ); Tue, 13 Apr 2021 10:11:13 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C51CC061756 for ; Tue, 13 Apr 2021 07:10:53 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id y124-20020a1c32820000b029010c93864955so10758083wmy.5 for ; Tue, 13 Apr 2021 07:10:53 -0700 (PDT) Received: from agape ([5.171.81.171]) by smtp.gmail.com with ESMTPSA id e33sm2453814wmp.43.2021.04.13.07.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 07:10:51 -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=jSEnliZNTsHjR6wKzUjuLn3oIHLdeYnyhs9bbaWyIUA=; b=nB0cmwNsf63cUFYyHFjtEpVDZH0Kcofnws9rf8b8M1U4/ngpQe7u7pQW4FJ7fyf6G3 PivU5CmB+mcZbCVZSgsXly9MqPS3jLdTdKRtexzrlbeIxMFBLxmQ0OJjOWmBEwmLtN5l i9SMwpxgEggVAhwHxSFt8oKpMaAMefwybg4S+/icb6TIBdjOFhRi3izp8pz3v4t4GF8W dul6ExSruQP+eB+aJihNMftnfQ0OYIpAKDeY1/3hfuiem+VsBnXJg3jUJKI1DPzEMGJE xt/g7XAExqQ4r+E8G2fEBB9HstOZnSYd6oMDwYtB9nkL97kgSXNBIC1PKxHwkHZnXHMr GEuQ== 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=jSEnliZNTsHjR6wKzUjuLn3oIHLdeYnyhs9bbaWyIUA=; b=oPcfRnJrponN1VRhO65ghzLA0dIUNWAW7dhhg0oWWWE5P1YUWNYh91PS0MjZLrZzUc DuLgEvuP9rud58qFC2V+aR4JPDeVrYpbm+A8mLK0OqhZFuKouWlpTTKXKjViftohMuoL Zvj73RjWzu5XuZcIDV3KK2ROO23ZT9IU8ss+9WWELhK2KkgNYtfRPuu8xIuEoaw8i11l kFlIEVjp4naWpvTiDRK/Tx3gvIbHuTZNop5LenNSUWF+uhQJAa2zj/01WL+yAgdYqyFS jA4A79JwfgPl2w7vvkNQp1srW/p0ZeK8RtdEg86wJ28S0Jqsy1ZsRRv/xq0F8yNcnk4O 1YwA== X-Gm-Message-State: AOAM531ljDtqSGKMAP4dkMNJeAi9Qq8qBFw5ryUkXLsm6O4WVvPlJc5l hdkkk/Lbojm66kasZtBGdvSPTe7c8gYnDw== X-Google-Smtp-Source: ABdhPJzemJVhR4vIenwSVzj0/E5nwHOJqJpCXv+QjR8HaJB9oXL7zts48rK4je6UhBvqiky5YT2HMg== X-Received: by 2002:a1c:6585:: with SMTP id z127mr239025wmb.46.1618323051737; Tue, 13 Apr 2021 07:10:51 -0700 (PDT) From: Fabio Aiuto Cc: julia.lawall@inria.fr, joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] staging: rtl8723bs: replace DBG_871X_SEL_NL with netdev_dbg() Date: Tue, 13 Apr 2021 16:10:39 +0200 Message-Id: <248f5113a2970d5f0199f12082a65f2af1164d72.1618322367.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" replace DGB_871X_SEL_NL macro with netdev_dbg(). DBG_871X_SEL_NL macro expands to a raw prink call or a seq_printf if selected stream _is not_ a local debug symbol set to null. This second scenario never occurs so replace all macro usages with netdev_dbg(). This is done with the following coccinelle script: @@ expression sel; expression list args; identifier padapter; identifier func; @@ func(..., struct adapter *padapter, ...) { <... - DBG_871X_SEL_NL(sel, args); + netdev_dbg(padapter->pnetdev, args); ...> } @rule@ identifier func, context, padapter; @@ func(void *context) { ... struct adapter *padapter =3D context; ... } @@ expression sel; expression list args; identifier rule.padapter; identifier rule.func, rule.context; @@ func(void *context) { <... - DBG_871X_SEL_NL(sel, args); + netdev_dbg(padapter->pnetdev, args); ...> } @@ expression sel; expression list args; expression get_dev; identifier func, dev; @@ func(...) { ... struct net_device *dev =3D get_dev; <... - DBG_871X_SEL_NL(sel, args); + netdev_dbg(dev, args); ...> } @@ expression sel; expression list args; identifier func, dev; @@ func(struct net_device *dev) { <... - DBG_871X_SEL_NL(sel, args); + netdev_dbg(dev, args); ...> } @@ expression sel; expression list args; identifier func, dvobj; @@ func(struct dvobj_priv *dvobj) { <... - DBG_871X_SEL_NL(sel, args); + netdev_dbg(dvobj->if1->pnetdev, args); ...> } Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/core/rtw_debug.c | 16 +++---- drivers/staging/rtl8723bs/core/rtw_odm.c | 49 +++++++++++----------- drivers/staging/rtl8723bs/hal/hal_com.c | 31 ++++++-------- 3 files changed, 46 insertions(+), 50 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/r= tl8723bs/core/rtw_debug.c index 324c7e5248f8..79fd968bb147 100644 --- a/drivers/staging/rtl8723bs/core/rtw_debug.c +++ b/drivers/staging/rtl8723bs/core/rtw_debug.c @@ -20,7 +20,7 @@ void sd_f0_reg_dump(void *sel, struct adapter *adapter) =20 for (i =3D 0x0; i <=3D 0xff; i++) { if (i%16 =3D=3D 0) - DBG_871X_SEL_NL(sel, "0x%02x ", i); + netdev_dbg(adapter->pnetdev, "0x%02x ", i); =20 DBG_871X_SEL(sel, "%02x ", rtw_sd_f0_read8(adapter, i)); =20 @@ -35,11 +35,11 @@ void mac_reg_dump(void *sel, struct adapter *adapter) { int i, j =3D 1; =20 - DBG_871X_SEL_NL(sel, "=3D=3D=3D=3D=3D=3D=3D MAC REG =3D=3D=3D=3D=3D=3D=3D= \n"); + netdev_dbg(adapter->pnetdev, "=3D=3D=3D=3D=3D=3D=3D MAC REG =3D=3D=3D=3D= =3D=3D=3D\n"); =20 for (i =3D 0x0; i < 0x800; i +=3D 4) { if (j%4 =3D=3D 1) - DBG_871X_SEL_NL(sel, "0x%03x", i); + netdev_dbg(adapter->pnetdev, "0x%03x", i); DBG_871X_SEL(sel, " 0x%08x ", rtw_read32(adapter, i)); if ((j++)%4 =3D=3D 0) DBG_871X_SEL(sel, "\n"); @@ -50,10 +50,10 @@ void bb_reg_dump(void *sel, struct adapter *adapter) { int i, j =3D 1; =20 - DBG_871X_SEL_NL(sel, "=3D=3D=3D=3D=3D=3D=3D BB REG =3D=3D=3D=3D=3D=3D=3D\= n"); + netdev_dbg(adapter->pnetdev, "=3D=3D=3D=3D=3D=3D=3D BB REG =3D=3D=3D=3D= =3D=3D=3D\n"); for (i =3D 0x800; i < 0x1000 ; i +=3D 4) { if (j%4 =3D=3D 1) - DBG_871X_SEL_NL(sel, "0x%03x", i); + netdev_dbg(adapter->pnetdev, "0x%03x", i); DBG_871X_SEL(sel, " 0x%08x ", rtw_read32(adapter, i)); if ((j++)%4 =3D=3D 0) DBG_871X_SEL(sel, "\n"); @@ -73,14 +73,14 @@ void rf_reg_dump(void *sel, struct adapter *adapter) else path_nums =3D 2; =20 - DBG_871X_SEL_NL(sel, "=3D=3D=3D=3D=3D=3D=3D RF REG =3D=3D=3D=3D=3D=3D=3D\= n"); + netdev_dbg(adapter->pnetdev, "=3D=3D=3D=3D=3D=3D=3D RF REG =3D=3D=3D=3D= =3D=3D=3D\n"); =20 for (path =3D 0; path < path_nums; path++) { - DBG_871X_SEL_NL(sel, "RF_Path(%x)\n", path); + netdev_dbg(adapter->pnetdev, "RF_Path(%x)\n", path); for (i =3D 0; i < 0x100; i++) { value =3D rtw_hal_read_rfreg(adapter, path, i, 0xffffffff); if (j%4 =3D=3D 1) - DBG_871X_SEL_NL(sel, "0x%02x ", i); + netdev_dbg(adapter->pnetdev, "0x%02x ", i); DBG_871X_SEL(sel, " 0x%08x ", value); if ((j++)%4 =3D=3D 0) DBG_871X_SEL(sel, "\n"); diff --git a/drivers/staging/rtl8723bs/core/rtw_odm.c b/drivers/staging/rtl= 8723bs/core/rtw_odm.c index 53f7cc0444ba..084f6ae040ee 100644 --- a/drivers/staging/rtl8723bs/core/rtw_odm.c +++ b/drivers/staging/rtl8723bs/core/rtw_odm.c @@ -96,12 +96,13 @@ void rtw_odm_dbg_comp_msg(void *sel, struct adapter *ad= apter) int i; =20 rtw_hal_get_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &dbg_comp); - DBG_871X_SEL_NL(sel, "odm.DebugComponents =3D 0x%016llx\n", dbg_comp); + netdev_dbg(adapter->pnetdev, "odm.DebugComponents =3D 0x%016llx\n", + dbg_comp); for (i =3D 0; i < RTW_ODM_COMP_MAX; i++) { if (odm_comp_str[i]) - DBG_871X_SEL_NL(sel, "%cBIT%-2d %s\n", - (BIT0 << i) & dbg_comp ? '+' : ' ', - i, odm_comp_str[i]); + netdev_dbg(adapter->pnetdev, "%cBIT%-2d %s\n", + (BIT0 << i) & dbg_comp ? '+' : ' ', i, + odm_comp_str[i]); } } =20 @@ -116,11 +117,11 @@ void rtw_odm_dbg_level_msg(void *sel, struct adapter = *adapter) int i; =20 rtw_hal_get_def_var(adapter, HW_DEF_ODM_DBG_LEVEL, &dbg_level); - DBG_871X_SEL_NL(sel, "odm.DebugLevel =3D %u\n", dbg_level); + netdev_dbg(adapter->pnetdev, "odm.DebugLevel =3D %u\n", dbg_level); for (i =3D 0; i < RTW_ODM_DBG_LEVEL_NUM; i++) { if (odm_dbg_level_str[i]) - DBG_871X_SEL_NL(sel, "%u %s\n", - i, odm_dbg_level_str[i]); + netdev_dbg(adapter->pnetdev, "%u %s\n", i, + odm_dbg_level_str[i]); } } =20 @@ -135,12 +136,12 @@ void rtw_odm_ability_msg(void *sel, struct adapter *a= dapter) int i; =20 rtw_hal_get_hwreg(adapter, HW_VAR_DM_FLAG, (u8 *)&ability); - DBG_871X_SEL_NL(sel, "odm.SupportAbility =3D 0x%08x\n", ability); + netdev_dbg(adapter->pnetdev, "odm.SupportAbility =3D 0x%08x\n", ability); for (i =3D 0; i < RTW_ODM_ABILITY_MAX; i++) { if (odm_ability_str[i]) - DBG_871X_SEL_NL(sel, "%cBIT%-2d %s\n", - (BIT0 << i) & ability ? '+' : ' ', i, - odm_ability_str[i]); + netdev_dbg(adapter->pnetdev, "%cBIT%-2d %s\n", + (BIT0 << i) & ability ? '+' : ' ', i, + odm_ability_str[i]); } } =20 @@ -154,17 +155,16 @@ void rtw_odm_adaptivity_parm_msg(void *sel, struct ad= apter *adapter) struct hal_com_data *pHalData =3D GET_HAL_DATA(adapter); struct dm_odm_t *odm =3D &pHalData->odmpriv; =20 - DBG_871X_SEL_NL(sel, "%10s %16s %8s %10s %11s %14s\n", - "TH_L2H_ini", "TH_EDCCA_HL_diff", "IGI_Base", - "ForceEDCCA", "AdapEn_RSSI", "IGI_LowerBound"); - DBG_871X_SEL_NL(sel, "0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n", - (u8)odm->TH_L2H_ini, - odm->TH_EDCCA_HL_diff, - odm->IGI_Base, - odm->ForceEDCCA, - odm->AdapEn_RSSI, - odm->IGI_LowerBound - ); + netdev_dbg(adapter->pnetdev, "%10s %16s %8s %10s %11s %14s\n", + "TH_L2H_ini", "TH_EDCCA_HL_diff", "IGI_Base", "ForceEDCCA", + "AdapEn_RSSI", "IGI_LowerBound");netdev_dbg(adapter->pnetdev, + "0x%-8x %-16d 0x%-6x %-10d %-11u %-14u\n", + (u8)odm->TH_L2H_ini, + odm->TH_EDCCA_HL_diff, + odm->IGI_Base, + odm->ForceEDCCA, + odm->AdapEn_RSSI, + odm->IGI_LowerBound); } =20 void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, @@ -188,6 +188,7 @@ void rtw_odm_get_perpkt_rssi(void *sel, struct adapter = *adapter) struct hal_com_data *hal_data =3D GET_HAL_DATA(adapter); struct dm_odm_t *odm =3D &hal_data->odmpriv; =20 - DBG_871X_SEL_NL(sel, "RxRate =3D %s, RSSI_A =3D %d(%%), RSSI_B =3D %d(%%)= \n", - HDATA_RATE(odm->RxRate), odm->RSSI_A, odm->RSSI_B); + netdev_dbg(adapter->pnetdev, + "RxRate =3D %s, RSSI_A =3D %d(%%), RSSI_B =3D %d(%%)\n", + HDATA_RATE(odm->RxRate), odm->RSSI_A, odm->RSSI_B); } diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8= 723bs/hal/hal_com.c index 4cceb3a969a8..2e2d40469a83 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com.c +++ b/drivers/staging/rtl8723bs/hal/hal_com.c @@ -1522,12 +1522,10 @@ void rtw_get_raw_rssi_info(void *sel, struct adapte= r *padapter) struct hal_com_data *pHalData =3D GET_HAL_DATA(padapter); struct rx_raw_rssi *psample_pkt_rssi =3D &padapter->recvpriv.raw_rssi_inf= o; =20 - DBG_871X_SEL_NL( - sel, - "RxRate =3D %s, PWDBALL =3D %d(%%), rx_pwr_all =3D %d(dBm)\n", - HDATA_RATE(psample_pkt_rssi->data_rate), - psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all - ); + netdev_dbg(padapter->pnetdev, + "RxRate =3D %s, PWDBALL =3D %d(%%), rx_pwr_all =3D %d(dBm)\n", + HDATA_RATE(psample_pkt_rssi->data_rate), + psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all); =20 isCCKrate =3D psample_pkt_rssi->data_rate <=3D DESC_RATE11M; =20 @@ -1535,20 +1533,17 @@ void rtw_get_raw_rssi_info(void *sel, struct adapte= r *padapter) psample_pkt_rssi->mimo_signal_strength[0] =3D psample_pkt_rssi->pwdball; =20 for (rf_path =3D 0; rf_path < pHalData->NumTotalRFPath; rf_path++) { - DBG_871X_SEL_NL( - sel, - "RF_PATH_%d =3D>signal_strength:%d(%%), signal_quality:%d(%%)\n", - rf_path, psample_pkt_rssi->mimo_signal_strength[rf_path], - psample_pkt_rssi->mimo_signal_quality[rf_path] - ); + netdev_dbg(padapter->pnetdev, + "RF_PATH_%d =3D>signal_strength:%d(%%), signal_quality:%d(%%)\n", + rf_path, + psample_pkt_rssi->mimo_signal_strength[rf_path], + psample_pkt_rssi->mimo_signal_quality[rf_path]); =20 if (!isCCKrate) { - DBG_871X_SEL_NL( - sel, - "\trx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n", - psample_pkt_rssi->ofdm_pwr[rf_path], - psample_pkt_rssi->ofdm_snr[rf_path] - ); + netdev_dbg(padapter->pnetdev, + "\trx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n", + psample_pkt_rssi->ofdm_pwr[rf_path], + psample_pkt_rssi->ofdm_snr[rf_path]); } } } --=20 2.20.1