linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Potter <phil@philpotter.co.uk>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev,
	linux-kernel@vger.kernel.org, insafonov@gmail.com,
	linux@roeck-us.net, straube.linux@gmail.com,
	liushixin2@huawei.com, gustavoars@kernel.org,
	christophe.jaillet@wanadoo.fr, yepeilin.cs@gmail.com,
	dan.carpenter@oracle.com, martin@kaiser.cx,
	simon.fodin@gmail.com, romain.perier@gmail.com,
	apais@linux.microsoft.com, mh12gx2825@gmail.com
Subject: [PATCH 1/3] staging: rtl8188eu: convert DBG_88E calls in core/rtw_efuse.c
Date: Sun, 13 Jun 2021 23:41:45 +0100	[thread overview]
Message-ID: <20210613224147.1045-2-phil@philpotter.co.uk> (raw)
In-Reply-To: <20210613224147.1045-1-phil@philpotter.co.uk>

Convert all calls to the DBG_88E macro in core/rtw_efuse.c into
netdev_dbg calls. The DBG_88E macro is unnecessary, as visibility of
debug messages can be controlled more precisely by just using debugfs.
It is important to keep these messages still, as they are displayable
via a kernel module parameter when using DBG_88E.

Also modify efuse_phymap_to_logical function signature to pass through
a struct net_device pointer, so that we can use it to call netdev_dbg
in this function too.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
 drivers/staging/rtl8188eu/core/rtw_efuse.c | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 9bb3ec0cd62f..019796c0f1af 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -72,7 +72,7 @@ static void efuse_power_switch(struct adapter *pAdapter, u8 write, u8 pwrstate)
 }
 
 static void
-efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8  *pbuf)
+efuse_phymap_to_logical(struct net_device *dev, u8 *phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
 {
 	u8 *efuseTbl = NULL;
 	u8 rtemp8;
@@ -92,7 +92,7 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8  *pbuf)
 		      sizeof(void *) + EFUSE_MAX_WORD_UNIT * sizeof(u16),
 		      GFP_KERNEL);
 	if (!tmp) {
-		DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
+		netdev_dbg(dev, "alloc eFuseWord fail!\n");
 		goto eFuseWord_failed;
 	}
 	for (i = 0; i < EFUSE_MAX_SECTION_88E; i++)
@@ -113,7 +113,9 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8  *pbuf)
 		efuse_utilized++;
 		eFuse_Addr++;
 	} else {
-		DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data =%x\n", eFuse_Addr, rtemp8);
+		netdev_dbg(dev,
+			   "EFUSE is empty efuse_Addr-%d efuse_data =%x\n",
+			   eFuse_Addr, rtemp8);
 		goto exit;
 	}
 
@@ -220,7 +222,7 @@ static void efuse_read_phymap_from_txpktbuf(
 	if (bcnhead < 0) /* if not valid */
 		bcnhead = usb_read8(adapter, REG_TDECTRL + 1);
 
-	DBG_88E("%s bcnhead:%d\n", __func__, bcnhead);
+	netdev_dbg(adapter->pnetdev, "bcnhead:%d\n", bcnhead);
 
 	usb_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
 
@@ -232,8 +234,10 @@ static void efuse_read_phymap_from_txpktbuf(
 		usb_write8(adapter, REG_TXPKTBUF_DBG, 0);
 		start = jiffies;
 		while (!(reg_0x143 = usb_read8(adapter, REG_TXPKTBUF_DBG)) &&
-		       jiffies_to_msecs(jiffies - start) < 1000) {
-			DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, usb_read8(adapter, 0x106));
+			jiffies_to_msecs(jiffies - start) < 1000) {
+			netdev_dbg(adapter->pnetdev,
+				   "polling reg_0x143:0x%02x, reg_0x106:0x%02x\n",
+				   reg_0x143, usb_read8(adapter, 0x106));
 			usleep_range(1000, 2000);
 		}
 
@@ -255,7 +259,9 @@ static void efuse_read_phymap_from_txpktbuf(
 
 			limit = min_t(u16, len - 2, limit);
 
-			DBG_88E("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __func__, len, lenbak, aaa, aaabak);
+			netdev_dbg(adapter->pnetdev,
+				   "len:%u, lenbak:%u, aaa:%u, aaabak:%u\n",
+				   len, lenbak, aaa, aaabak);
 
 			memcpy(pos, ((u8 *)&lo32) + 2, (limit >= count + 2) ? 2 : limit - count);
 			count += (limit >= count + 2) ? 2 : limit - count;
@@ -278,7 +284,7 @@ static void efuse_read_phymap_from_txpktbuf(
 		i++;
 	}
 	usb_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);
-	DBG_88E("%s read count:%u\n", __func__, count);
+	netdev_dbg(adapter->pnetdev, "read count:%u\n", count);
 	*size = count;
 }
 
@@ -294,7 +300,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offset
 	status = iol_execute(padapter, CMD_READ_EFUSE_MAP);
 	if (status == _SUCCESS)
 		efuse_read_phymap_from_txpktbuf(padapter, txpktbuf_bndy, physical_map, &size);
-	efuse_phymap_to_logical(physical_map, offset, size_byte, logical_map);
+	efuse_phymap_to_logical(padapter->pnetdev, physical_map, offset, size_byte, logical_map);
 	return status;
 }
 
@@ -432,7 +438,8 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data)
 						hoffset = ((tmp_header & 0xE0) >> 5) | ((efuse_data & 0xF0) >> 1);
 						hworden = efuse_data & 0x0F;
 					} else {
-						DBG_88E("Error, All words disabled\n");
+						netdev_dbg(pAdapter->pnetdev,
+							   "Error, All words disabled\n");
 						efuse_addr++;
 						continue;
 					}
-- 
2.30.2


  reply	other threads:[~2021-06-13 22:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-13 22:41 [PATCH 0/3] convert more DBG_88E calls and remove dead code Phillip Potter
2021-06-13 22:41 ` Phillip Potter [this message]
2021-06-14  6:50   ` [PATCH 1/3] staging: rtl8188eu: convert DBG_88E calls in core/rtw_efuse.c Dan Carpenter
2021-06-14 21:29     ` Phillip Potter
2021-06-13 22:41 ` [PATCH 2/3] staging: rtl8188eu: convert DBG_88E calls in core/rtw_xmit.c Phillip Potter
2021-06-13 22:41 ` [PATCH 3/3] staging: rtl8188eu: remove core/rtw_debug.c Phillip Potter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210613224147.1045-2-phil@philpotter.co.uk \
    --to=phil@philpotter.co.uk \
    --cc=Larry.Finger@lwfinger.net \
    --cc=apais@linux.microsoft.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=dan.carpenter@oracle.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=gustavoars@kernel.org \
    --cc=insafonov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=linux@roeck-us.net \
    --cc=liushixin2@huawei.com \
    --cc=martin@kaiser.cx \
    --cc=mh12gx2825@gmail.com \
    --cc=romain.perier@gmail.com \
    --cc=simon.fodin@gmail.com \
    --cc=straube.linux@gmail.com \
    --cc=yepeilin.cs@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).