From: rafad900 <rafad900@gmail.com>
To: Jes.Sorensen@gmail.com, linux-kernel@vger.kernel.org,
linux-wireless@vger.kernel.org
Cc: rafad900 <rafad900@gmail.com>
Subject: [PATCH v2] wifi: rtl8xxxu: Use local 'dev' variable for dev_warn()
Date: Sun, 16 Aug 2026 22:22:50 -0700 [thread overview]
Message-ID: <20260817052250.358796-1-rafad900@gmail.com> (raw)
To ensure consistent patterns, the device struct was
defined and used when dev_warn() is called.
This follows the logging pattern used in most of
rtl8xxxu files.
Signed-off-by: Rafael Alejandro Diaz Cruz <rafad900@gmail.com>
---
drivers/net/wireless/realtek/rtl8xxxu/8188e.c | 3 ++-
drivers/net/wireless/realtek/rtl8xxxu/8188f.c | 3 ++-
drivers/net/wireless/realtek/rtl8xxxu/8192e.c | 12 ++++++----
drivers/net/wireless/realtek/rtl8xxxu/8192f.c | 9 ++++---
drivers/net/wireless/realtek/rtl8xxxu/8723a.c | 3 ++-
drivers/net/wireless/realtek/rtl8xxxu/8723b.c | 3 ++-
drivers/net/wireless/realtek/rtl8xxxu/core.c | 24 ++++++++++++-------
7 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8188e.c b/drivers/net/wireless/realtek/rtl8xxxu/8188e.c
index fea5aec9ced9..4a64633b2da3 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8188e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8188e.c
@@ -643,6 +643,7 @@ static int rtl8188eu_iqk_path_a(struct rtl8xxxu_priv *priv)
static int rtl8188eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_ea4, reg_eac, reg_e94, reg_e9c, val32;
int result = 0;
@@ -740,7 +741,7 @@ static int rtl8188eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
((reg_eac & 0x03ff0000) != 0x00360000))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path A RX IQK failed!\n",
+ dev_warn(dev, "%s: Path A RX IQK failed!\n",
__func__);
out:
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8188f.c b/drivers/net/wireless/realtek/rtl8xxxu/8188f.c
index 5556aad1a7ad..68609ce37ab0 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8188f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8188f.c
@@ -789,6 +789,7 @@ static int rtl8188fu_init_phy_rf(struct rtl8xxxu_priv *priv)
void rtl8188f_phy_lc_calibrate(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 val32;
u32 rf_amode, lstf;
int i;
@@ -819,7 +820,7 @@ void rtl8188f_phy_lc_calibrate(struct rtl8xxxu_priv *priv)
}
if (i == 100)
- dev_warn(&priv->udev->dev, "LC calibration timed out.\n");
+ dev_warn(dev, "LC calibration timed out.\n");
rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_MODE_AG, rf_amode);
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/8192e.c
index 690ace303150..8385ada532b3 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8192e.c
@@ -742,6 +742,7 @@ static int rtl8192eu_iqk_path_a(struct rtl8xxxu_priv *priv)
static int rtl8192eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_ea4, reg_eac, reg_e94, reg_e9c, val32;
int result = 0;
@@ -860,7 +861,7 @@ static int rtl8192eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
((reg_eac & 0x03ff0000) != 0x00360000))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path A RX IQK failed!\n",
+ dev_warn(dev, "%s: Path A RX IQK failed!\n",
__func__);
out:
@@ -869,6 +870,7 @@ static int rtl8192eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
static int rtl8192eu_iqk_path_b(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_eb4, reg_ebc;
int result = 0;
@@ -910,7 +912,7 @@ static int rtl8192eu_iqk_path_b(struct rtl8xxxu_priv *priv)
((reg_ebc & 0x03ff0000) != 0x00420000))
result |= 0x01;
else
- dev_warn(&priv->udev->dev, "%s: Path B IQK failed!\n",
+ dev_warn(dev, "%s: Path B IQK failed!\n",
__func__);
return result;
@@ -918,6 +920,7 @@ static int rtl8192eu_iqk_path_b(struct rtl8xxxu_priv *priv)
static int rtl8192eu_rx_iqk_path_b(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc, val32;
int result = 0;
@@ -1040,7 +1043,7 @@ static int rtl8192eu_rx_iqk_path_b(struct rtl8xxxu_priv *priv)
((reg_ecc & 0x03ff0000) != 0x00360000))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path B RX IQK failed!\n",
+ dev_warn(dev, "%s: Path B RX IQK failed!\n",
__func__);
out:
@@ -1495,6 +1498,7 @@ static int rtl8192eu_active_to_lps(struct rtl8xxxu_priv *priv)
static int rtl8192eu_active_to_emu(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u8 val8;
int count, ret = 0;
@@ -1521,7 +1525,7 @@ static int rtl8192eu_active_to_emu(struct rtl8xxxu_priv *priv)
}
if (!count) {
- dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
+ dev_warn(dev, "%s: Disabling MAC timed out\n",
__func__);
ret = -EBUSY;
goto exit;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8192f.c b/drivers/net/wireless/realtek/rtl8xxxu/8192f.c
index 5f076da4b550..0b8c068215d7 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8192f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8192f.c
@@ -681,6 +681,7 @@ static void rtl8192fu_init_aggregation(struct rtl8xxxu_priv *priv)
static int rtl8192fu_parse_efuse(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
struct rtl8192fu_efuse *efuse = &priv->efuse_wifi.efuse8192fu;
int i;
@@ -731,7 +732,7 @@ static int rtl8192fu_parse_efuse(struct rtl8xxxu_priv *priv)
priv->rfe_type = efuse->rfe_option & 0x1f;
if (priv->rfe_type != 5 && priv->rfe_type != 1)
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"%s: RFE type %d was not tested. Please send an email to linux-wireless@vger.kernel.org about this.\n",
__func__, priv->rfe_type);
@@ -1022,6 +1023,7 @@ static int rtl8192fu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
static int rtl8192fu_iqk_path_b(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_eb4, reg_ebc, val32;
u32 rf_0x58_i, rf_0x58_q;
u8 rfe = priv->rfe_type;
@@ -1109,7 +1111,7 @@ static int rtl8192fu_iqk_path_b(struct rtl8xxxu_priv *priv)
((reg_ebc & 0x03ff0000) != 0x00420000))
result |= 0x01;
else
- dev_warn(&priv->udev->dev, "%s: Path B IQK failed!\n",
+ dev_warn(dev, "%s: Path B IQK failed!\n",
__func__);
return result;
@@ -1117,6 +1119,7 @@ static int rtl8192fu_iqk_path_b(struct rtl8xxxu_priv *priv)
static int rtl8192fu_rx_iqk_path_b(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc, val32;
int result = 0;
int ktime;
@@ -1246,7 +1249,7 @@ static int rtl8192fu_rx_iqk_path_b(struct rtl8xxxu_priv *priv)
((reg_ecc & 0x03ff0000) != 0x00360000))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path B RX IQK failed!\n",
+ dev_warn(dev, "%s: Path B RX IQK failed!\n",
__func__);
return result;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8723a.c b/drivers/net/wireless/realtek/rtl8xxxu/8723a.c
index 18e038b82f49..3525ecf07b48 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8723a.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8723a.c
@@ -413,6 +413,7 @@ static int rtl8723au_power_on(struct rtl8xxxu_priv *priv)
static int rtl8723au_active_to_emu(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u8 val8;
int count, ret = 0;
@@ -439,7 +440,7 @@ static int rtl8723au_active_to_emu(struct rtl8xxxu_priv *priv)
}
if (!count) {
- dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
+ dev_warn(dev, "%s: Disabling MAC timed out\n",
__func__);
ret = -EBUSY;
goto exit;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/8723b.c
index e314ef991b38..5c077b1372ee 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8723b.c
@@ -1225,6 +1225,7 @@ static void rtl8723bu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
static int rtl8723bu_active_to_emu(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u8 val8;
u16 val16;
u32 val32;
@@ -1256,7 +1257,7 @@ static int rtl8723bu_active_to_emu(struct rtl8xxxu_priv *priv)
}
if (!count) {
- dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
+ dev_warn(dev, "%s: Disabling MAC timed out\n",
__func__);
ret = -EBUSY;
goto exit;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c
index 646fe76b086e..8e78134a8131 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c
@@ -2187,6 +2187,7 @@ void rtl8xxxu_firmware_self_reset(struct rtl8xxxu_priv *priv)
static int
rtl8xxxu_init_mac(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
const struct rtl8xxxu_reg8val *array = priv->fops->mactable;
int i, ret;
u16 reg;
@@ -2201,7 +2202,7 @@ rtl8xxxu_init_mac(struct rtl8xxxu_priv *priv)
ret = rtl8xxxu_write8(priv, reg, val);
if (ret != 1) {
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"Failed to initialize MAC "
"(reg: %04x, val %02x)\n", reg, val);
return -EAGAIN;
@@ -2229,6 +2230,7 @@ rtl8xxxu_init_mac(struct rtl8xxxu_priv *priv)
int rtl8xxxu_init_phy_regs(struct rtl8xxxu_priv *priv,
const struct rtl8xxxu_reg32val *array)
{
+ struct device *dev = &priv->udev->dev;
int i, ret;
u16 reg;
u32 val;
@@ -2242,7 +2244,7 @@ int rtl8xxxu_init_phy_regs(struct rtl8xxxu_priv *priv,
ret = rtl8xxxu_write32(priv, reg, val);
if (ret != sizeof(val)) {
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"Failed to initialize PHY\n");
return -EAGAIN;
}
@@ -2387,6 +2389,7 @@ static int rtl8xxxu_init_rf_regs(struct rtl8xxxu_priv *priv,
const struct rtl8xxxu_rfregval *array,
enum rtl8xxxu_rfpath path)
{
+ struct device *dev = &priv->udev->dev;
int i, ret;
u8 reg;
u32 val;
@@ -2421,7 +2424,7 @@ static int rtl8xxxu_init_rf_regs(struct rtl8xxxu_priv *priv,
ret = rtl8xxxu_write_rfreg(priv, path, reg, val);
if (ret) {
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"Failed to initialize RF\n");
return -EAGAIN;
}
@@ -2558,6 +2561,7 @@ int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv)
int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 val32;
int ret = 0;
int i;
@@ -2575,7 +2579,7 @@ int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv)
if (!i) {
ret = -EBUSY;
- dev_warn(&priv->udev->dev, "LLT table init failed\n");
+ dev_warn(dev, "LLT table init failed\n");
}
return ret;
@@ -3089,6 +3093,7 @@ void rtl8xxxu_mac_calibration(struct rtl8xxxu_priv *priv,
static int rtl8xxxu_iqk_path_a(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_e94, reg_e9c, reg_ea4, val32;
int result = 0;
@@ -3138,7 +3143,7 @@ static int rtl8xxxu_iqk_path_a(struct rtl8xxxu_priv *priv)
((reg_eac & 0x03ff0000) != 0x00360000))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path A RX IQK failed!\n",
+ dev_warn(dev, "%s: Path A RX IQK failed!\n",
__func__);
out:
return result;
@@ -3146,6 +3151,7 @@ static int rtl8xxxu_iqk_path_a(struct rtl8xxxu_priv *priv)
static int rtl8xxxu_iqk_path_b(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc;
int result = 0;
@@ -3174,7 +3180,7 @@ static int rtl8xxxu_iqk_path_b(struct rtl8xxxu_priv *priv)
(((reg_ecc & 0x03ff0000) >> 16) != 0x36))
result |= 0x02;
else
- dev_warn(&priv->udev->dev, "%s: Path B RX IQK failed!\n",
+ dev_warn(dev, "%s: Path B RX IQK failed!\n",
__func__);
out:
return result;
@@ -3638,6 +3644,7 @@ static void rtl8xxxu_set_ampdu_min_space(struct rtl8xxxu_priv *priv, u8 density)
int rtl8xxxu_active_to_lps(struct rtl8xxxu_priv *priv)
{
+ struct device *dev = &priv->udev->dev;
u8 val8;
u8 val32;
int count, ret = 0;
@@ -3655,7 +3662,7 @@ int rtl8xxxu_active_to_lps(struct rtl8xxxu_priv *priv)
}
if (!count) {
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"%s: RX poll timed out (0x05f8)\n", __func__);
ret = -EBUSY;
goto exit;
@@ -5860,6 +5867,7 @@ static void rtl8xxxu_queue_rx_urb(struct rtl8xxxu_priv *priv,
static void rtl8xxxu_rx_urb_work(struct work_struct *work)
{
+ struct device *dev = &priv->udev->dev;
struct rtl8xxxu_priv *priv;
struct rtl8xxxu_rx_urb *rx_urb, *tmp;
struct list_head local;
@@ -5893,7 +5901,7 @@ static void rtl8xxxu_rx_urb_work(struct work_struct *work)
rtl8xxxu_queue_rx_urb(priv, rx_urb);
break;
default:
- dev_warn(&priv->udev->dev,
+ dev_warn(dev,
"failed to requeue urb with error %i\n", ret);
skb = (struct sk_buff *)rx_urb->urb.context;
dev_kfree_skb(skb);
--
2.43.0
next reply other threads:[~2026-08-17 5:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 5:22 rafad900 [this message]
2026-08-17 8:31 ` [PATCH v2] wifi: rtl8xxxu: Use local 'dev' variable for dev_warn() Ping-Ke Shih
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=20260817052250.358796-1-rafad900@gmail.com \
--to=rafad900@gmail.com \
--cc=Jes.Sorensen@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.