1. Patchew
  2. linux
  3. [PATCH 0/2] staging: rtl8723bs: change remaining printk to proper api and remove commented code
  4. View patch

[PATCH 1/2] staging: rtl8723bs: change remaining printk to proper api

Rodrigo Gobbi posted 2 patches 1 month, 1 week ago
[PATCH 1/2] staging: rtl8723bs: change remaining printk to proper api
Posted by Rodrigo Gobbi 1 month, 1 week ago 
As part of TODO file for future work, use dyn debug api for
remaining printk statements.

Signed-off-by: Rodrigo Gobbi <rodrigo.gobbi.7@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c     |  6 +++---
 drivers/staging/rtl8723bs/hal/hal_com.c           |  7 ++++---
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 10 ++++++----
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c      |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index bbdd5fce28a1..58da34f125db 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1870,10 +1870,10 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv
 	if (0) {
 		int pp;
 
-		printk("pattrib->pktlen = %d =>", pattrib->pkt_len);
+		pr_debug("pattrib->pktlen = %d =>", pattrib->pkt_len);
 		for (pp = 0; pp < pattrib->pkt_len; pp++)
-			printk(" %02x ", pframe[pp]);
-		printk("\n");
+			pr_debug(" %02x ", pframe[pp]);
+		pr_debug("\n");
 	}
 
 	return _SUCCESS;
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 719dd116d807..484e0b4e489f 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -910,10 +910,11 @@ void rtw_dump_raw_rssi_info(struct adapter *padapter)
 
 	for (rf_path = 0; rf_path < pHalData->NumTotalRFPath; rf_path++) {
 		if (!isCCKrate) {
-			printk(", rx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n",
-			psample_pkt_rssi->ofdm_pwr[rf_path], psample_pkt_rssi->ofdm_snr[rf_path]);
+			pr_debug(", rx_ofdm_pwr:%d(dBm), rx_ofdm_snr:%d(dB)\n",
+				 psample_pkt_rssi->ofdm_pwr[rf_path],
+				 psample_pkt_rssi->ofdm_snr[rf_path]);
 		} else {
-			printk("\n");
+			pr_debug("\n");
 		}
 	}
 }
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 37ebbbf408ec..b9c6cd1f80d6 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -62,7 +62,8 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
 	for (i = 0; i < blockCount_p1; i++) {
 		ret = rtw_write32(padapter, (FW_8723B_START_ADDRESS + i * blockSize_p1), *((u32 *)(bufferPtr + i * blockSize_p1)));
 		if (ret == _FAIL) {
-			printk("====>%s %d i:%d\n", __func__, __LINE__, i);
+			pr_debug("write failed at %s %d, block:%d\n",
+				 __func__, __LINE__, i);
 			goto exit;
 		}
 	}
@@ -85,7 +86,8 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
 			ret = rtw_write8(padapter, (FW_8723B_START_ADDRESS + offset + i), *(bufferPtr + offset + i));
 
 			if (ret == _FAIL) {
-				printk("====>%s %d i:%d\n", __func__, __LINE__, i);
+				pr_debug("write failed at %s %d, block:%d\n",
+					 __func__, __LINE__, i);
 				goto exit;
 			}
 		}
@@ -127,7 +129,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 		ret = _PageWrite(padapter, page, bufferPtr+offset, MAX_DLFW_PAGE_SIZE);
 
 		if (ret == _FAIL) {
-			printk("====>%s %d\n", __func__, __LINE__);
+			pr_debug("page write failed at %s %d\n", __func__, __LINE__);
 			goto exit;
 		}
 	}
@@ -138,7 +140,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
 		ret = _PageWrite(padapter, page, bufferPtr+offset, remainSize);
 
 		if (ret == _FAIL) {
-			printk("====>%s %d\n", __func__, __LINE__);
+			pr_debug("remaining page write failed at %s %d\n", __func__, __LINE__);
 			goto exit;
 		}
 	}
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d18fde4e5d6c..b845089e8d8e 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -72,7 +72,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)
 	err = sdio_claim_irq(func, &sd_sync_int_hdl);
 	if (err) {
 		dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;
-		printk(KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n", __func__, err);
+		pr_crit("%s: sdio_claim_irq FAIL(%d)!\n", __func__, err);
 	} else {
 		dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++;
 		dvobj->irq_alloc = 1;
-- 
2.34.1
Re: [PATCH 1/2] staging: rtl8723bs: change remaining printk to proper api
Posted by Dan Carpenter 1 month, 1 week ago 
On Mon, Oct 14, 2024 at 10:47:37PM -0300, Rodrigo Gobbi wrote:
> As part of TODO file for future work, use dyn debug api for
> remaining printk statements.
> 
> Signed-off-by: Rodrigo Gobbi <rodrigo.gobbi.7@gmail.com>
> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme_ext.c     |  6 +++---
>  drivers/staging/rtl8723bs/hal/hal_com.c           |  7 ++++---
>  drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 10 ++++++----
>  drivers/staging/rtl8723bs/os_dep/sdio_intf.c      |  2 +-
>  4 files changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index bbdd5fce28a1..58da34f125db 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -1870,10 +1870,10 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv
>  	if (0) {
>  		int pp;
>  
> -		printk("pattrib->pktlen = %d =>", pattrib->pkt_len);
> +		pr_debug("pattrib->pktlen = %d =>", pattrib->pkt_len);
>  		for (pp = 0; pp < pattrib->pkt_len; pp++)
> -			printk(" %02x ", pframe[pp]);
> -		printk("\n");
> +			pr_debug(" %02x ", pframe[pp]);
> +		pr_debug("\n");

No, this isn't right.  You'd need to use a mix of dev_dbg() and pr_cont().
Basically in drivers it should always be dev_ printks except for pr_cont().

regards,
dan carpenter
[PATCH 1/2] staging: rtl8723bs: change remaining printk to proper api
Posted by Rodrigo Gobbi 1 month, 1 week ago 
> No, this isn't right.  You'd need to use a mix of dev_dbg() and pr_cont().
> Basically in drivers it should always be dev_ printks except for pr_cont().

Tks, Dan, for the answer and suggestion. In this case, rather the dev_xxx(),
do you think we can go with netdev_dbg() since this is a network driver and around
the rtw_mlme_ext.c is already being used? (actually, I don't see a direct reference for struct device).
If yes, I would mix the netdev_dbg() and pr_cont().

About [2], it is acceptable to remove the statements like I'm proposing?
Tks and regards.

[2] https://lore.kernel.org/linux-staging/20241015014738.41685-1-rodrigo.gobbi.7@gmail.com/T/#m85d88af4dd8158a8e62ccb6c7257478b7de46d95
Re: [PATCH 1/2] staging: rtl8723bs: change remaining printk to proper api
Posted by Greg KH 1 month, 1 week ago 
On Tue, Oct 15, 2024 at 06:38:22PM -0300, Rodrigo Gobbi wrote:
> > No, this isn't right.  You'd need to use a mix of dev_dbg() and pr_cont().
> > Basically in drivers it should always be dev_ printks except for pr_cont().
> 
> Tks, Dan, for the answer and suggestion. In this case, rather the dev_xxx(),
> do you think we can go with netdev_dbg() since this is a network driver and around
> the rtw_mlme_ext.c is already being used? (actually, I don't see a direct reference for struct device).
> If yes, I would mix the netdev_dbg() and pr_cont().

Please use netdev_dbg() for a networking driver.

thanks,

greg k-h

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.