From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BBF76F for ; Wed, 31 Mar 2021 09:40:57 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id e7so21489474edu.10 for ; Wed, 31 Mar 2021 02:40:57 -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=1qPVs0bYVxCxR2wysk604dzz6mqKNkseUVOBA1IKBLI=; b=P9bMVX2AirHfF52VCFczou7wj5jHDqehADOyldoHp0aLPw+s/FaYkJIMKwHK/Qgao1 O41bRs+CLhqg15Boee2MsW+9Mfo+k0K6YiBEAu02z8tI3d3rMO2Wlp4ujuU0m6Gl9Pd7 keApeIc3rAEhZaf+MEGCoKjNUA5OoP/wl3djugbLWxGauYGpP8lLMGQMnVV0dB61qyhx Ji/8qInAEJAhvR2eesROEI8GuanRCSdRW+tZvCdpOM78On83yCCl4CJPLt3ADPMepj1I q4AYv4fkFvDZZyih4Bctnb6I03dYnwssytkP8OXuFzyh54ffe2hWnVNXARa+i/YZYac2 3fIA== 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=1qPVs0bYVxCxR2wysk604dzz6mqKNkseUVOBA1IKBLI=; b=POpRb48dSGXVgjpGcFx9lk96p7R++IqNCAyancnwJjfTUfmwbfaCJMSqmoMDOCc0kO 81JbkIuCDDlwrK3FoQWd0shKrsVdh3yPEpFOEDk4/K5h0NmnswkNqMoOcMi6WZb/FElr Vy+kwIws8aEMWXGSEhq2fOy/2V5mF0ipO3scJxMMyyXjTV8zMyWgYrAYdpeSMYw38JMr J9xcPzFj5/mGZkSS526mf0WJM4dQBTfnx1Qib2rN7LAFAXmprrvw4QNn2rE7zKcPbOhZ rbaWhSPJvQY6GEeykpWw36aMl2zX6Z+lmdIeFQAVHdKMqcK13KtuM+EPo3CpsPMZmb/V feXw== X-Gm-Message-State: AOAM5334nxs39UlyMKBD5HTjqH4Oy1cTlrQPQqNJyadyPTwj7yL3J+T9 o5j/yktL209wGcaOjFg6vx8= X-Google-Smtp-Source: ABdhPJy03OWjcphV3Cf/FAt7S8MDSEhuUF1WYHleWBYlKCXWKu42ZWgezSsT72KB4KynRffTpjy/Yw== X-Received: by 2002:aa7:db53:: with SMTP id n19mr2641911edt.330.1617183656081; Wed, 31 Mar 2021 02:40:56 -0700 (PDT) Received: from agape ([5.171.73.44]) by smtp.gmail.com with ESMTPSA id cf4sm1114510edb.19.2021.03.31.02.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 02:40:55 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Fabio Aiuto Subject: [PATCH 23/40] staging: rtl8723bs: replace RT_TRACE with public printk wrappers in hal/rtl8723b_phycfg.c Date: Wed, 31 Mar 2021 11:39:51 +0200 Message-Id: <2f7810b574e66949890cbfea9c99042daec9f044.1617183374.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit replace private macro RT_TRACE for tracing with in-kernel pr_* printk wrappers Signed-off-by: Fabio Aiuto --- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c index 2abff4673be2..59a659b76995 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c @@ -551,7 +551,7 @@ void PHY_SetTxPowerIndex( break; } } else { - RT_TRACE(_module_hal_init_c_, _drv_err_, ("Invalid RFPath!!\n")); + pr_err("%s Invalid RFPath!!\n", DRIVER_PREFIX); } } @@ -604,11 +604,11 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel) RFPath = pHalData->ant_path; } - RT_TRACE(_module_hal_init_c_, _drv_info_, ("==>PHY_SetTxPowerLevel8723B()\n")); + pr_info("%s ==> %s\n", DRIVER_PREFIX, __func__); PHY_SetTxPowerLevelByPath(Adapter, Channel, RFPath); - RT_TRACE(_module_hal_init_c_, _drv_info_, ("<==PHY_SetTxPowerLevel8723B()\n")); + pr_info("%s <== %s\n", DRIVER_PREFIX, __func__); } void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel) @@ -648,23 +648,20 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) u8 SCSettingOf40 = 0, SCSettingOf20 = 0; struct hal_com_data *pHalData = GET_HAL_DATA(Adapter); - RT_TRACE( - _module_hal_init_c_, - _drv_info_, - ( - "SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n", - pHalData->CurrentChannelBW, - pHalData->nCur80MhzPrimeSC, - pHalData->nCur40MhzPrimeSC - ) - ); + pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, " + "pHalData->nCur80MhzPrimeSC %d, pHalData->nCur40MhzPrimeSC %d\n", + DRIVER_PREFIX, + pHalData->CurrentChannelBW, + pHalData->nCur80MhzPrimeSC, + pHalData->nCur40MhzPrimeSC); + if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) { if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) SCSettingOf40 = VHT_DATA_SC_40_LOWER_OF_80MHZ; else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) SCSettingOf40 = VHT_DATA_SC_40_UPPER_OF_80MHZ; else - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n")); + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n", DRIVER_PREFIX); if ( (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) && @@ -687,27 +684,26 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter) ) SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ; else - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n")); + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n", + DRIVER_PREFIX); } else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) { - RT_TRACE( - _module_hal_init_c_, - _drv_info_, - ( - "SCMapping: VHT Case: pHalData->CurrentChannelBW %d, pHalData->nCur40MhzPrimeSC %d\n", - pHalData->CurrentChannelBW, - pHalData->nCur40MhzPrimeSC - ) - ); + pr_info("%s SCMapping: VHT Case: pHalData->CurrentChannelBW %d, " + "pHalData->nCur40MhzPrimeSC %d\n", + DRIVER_PREFIX, pHalData->CurrentChannelBW, + pHalData->nCur40MhzPrimeSC); if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ; else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ; else - RT_TRACE(_module_hal_init_c_, _drv_err_, ("SCMapping: Not Correct Primary40MHz Setting\n")); + pr_err("%s SCMapping: Not Correct Primary40MHz Setting\n", + DRIVER_PREFIX); } - RT_TRACE(_module_hal_init_c_, _drv_info_, ("SCMapping: SC Value %x\n", ((SCSettingOf40 << 4) | SCSettingOf20))); + pr_info("%s SCMapping: SC Value %x\n", + DRIVER_PREFIX, ((SCSettingOf40 << 4) | SCSettingOf20)); + return (SCSettingOf40 << 4) | SCSettingOf20; } -- 2.20.1