* [PATCH v3 0/4] rtw88: Fix some Sparse Warnings
@ 2022-05-24 15:36 Larry Finger
2022-05-24 15:36 ` [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec Larry Finger
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Larry Finger @ 2022-05-24 15:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: Johannes Berg, linux-wireless, Larry Finger, Ping-Ke Shih
Sparse shows warnings for symbols that can be static. In these cases.
the wrong solution is suggested - again reinforcing the concept
that all tools may suggest the wrong answer, and must be checked.
Constify all *_hw_spec variables
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
v2 Change patch subjects as recommended by Kalle
v3 Make the correct fix for the warnings - 'static' is incorrect, but const is correct
---
Larry Finger (4):
rtw88: Fix sparse warning for rtw8822b_hw_spec
rtw88: Fix Sparse warning for rtw8822c_hw_spec
rtw88: Fix Sparse warning for rtw8723d_hw_spec
rtw88: Fix Sparse warning for rtw8821c_hw_spec
drivers/net/wireless/realtek/rtw88/rtw8723d.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8723de.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8723de.h | 10 ----------
drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8821ce.h | 10 ----------
drivers/net/wireless/realtek/rtw88/rtw8822b.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8822be.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822be.h | 10 ----------
drivers/net/wireless/realtek/rtw88/rtw8822c.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822ce.h | 10 ----------
12 files changed, 12 insertions(+), 44 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.h
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h
--
2.36.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec
2022-05-24 15:36 [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Larry Finger
@ 2022-05-24 15:36 ` Larry Finger
2022-05-30 11:06 ` [v3,1/4] wifi: " Kalle Valo
2022-05-24 15:36 ` [PATCH v3 2/4] rtw88: Fix Sparse warning for rtw8822c_hw_spec Larry Finger
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Larry Finger @ 2022-05-24 15:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: Johannes Berg, linux-wireless, Larry Finger, Ping-Ke Shih
Sparse lists the following for rtw88:
CHECK drivers/net/wireless/realtek/rtw88/rtw8822b.c
drivers/net/wireless/realtek/rtw88/rtw8822b.c:2500:22: warning: symbol 'rtw8822b_hw_spec' was not declared. Should it be static?
The warning arises because the external declaration for rtw8822b_hw_spec
occurs in rtw8822be.h, which is not included in rtw8822b.h. That line is
moved, and the now empty file rtw8822be.h is deleted.
Symbol 'rtw8822b_hw_spec' can be made constant.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
---
v2 Change patch subjects as recommended by Kalle
v3 Make the correct fix for the warnings - 'static' is incorrect, but const is correct
---
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822b.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8822be.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822be.h | 10 ----------
4 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index dccd722b8e62..321848870561 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2497,7 +2497,7 @@ static struct rtw_hw_reg_offset rtw8822b_edcca_th[] = {
[EDCCA_TH_H2L_IDX] = {{.addr = 0x8a4, .mask = MASKBYTE1}, .offset = 0},
};
-struct rtw_chip_info rtw8822b_hw_spec = {
+const struct rtw_chip_info rtw8822b_hw_spec = {
.ops = &rtw8822b_ops,
.id = RTW_CHIP_TYPE_8822B,
.fw_name = "rtw88/rtw8822b_fw.bin",
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.h b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
index 3fff8b881854..01d3644e0c94 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
@@ -187,4 +187,6 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
#define REG_ANTWT 0x1904
#define REG_IQKFAILMSK 0x1bf0
+extern const struct rtw_chip_info rtw8822b_hw_spec;
+
#endif
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822be.c b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
index 62ee7e62cac0..4994950776cd 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822be.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822be.c
@@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include "pci.h"
-#include "rtw8822be.h"
+#include "rtw8822b.h"
static const struct pci_device_id rtw_8822be_id_table[] = {
{
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822be.h b/drivers/net/wireless/realtek/rtw88/rtw8822be.h
deleted file mode 100644
index 6668460d664d..000000000000
--- a/drivers/net/wireless/realtek/rtw88/rtw8822be.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2018-2019 Realtek Corporation
- */
-
-#ifndef __RTW_8822BE_H_
-#define __RTW_8822BE_H_
-
-extern struct rtw_chip_info rtw8822b_hw_spec;
-
-#endif
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/4] rtw88: Fix Sparse warning for rtw8822c_hw_spec
2022-05-24 15:36 [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Larry Finger
2022-05-24 15:36 ` [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec Larry Finger
@ 2022-05-24 15:36 ` Larry Finger
2022-05-24 15:36 ` [PATCH v3 3/4] rtw88: Fix Sparse warning for rtw8723d_hw_spec Larry Finger
2022-05-25 0:18 ` [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Ping-Ke Shih
3 siblings, 0 replies; 6+ messages in thread
From: Larry Finger @ 2022-05-24 15:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: Johannes Berg, linux-wireless, Larry Finger, Ping-Ke Shih
Sparse reports the following:
CHECK drivers/net/wireless/realtek/rtw88/rtw8822c.c
drivers/net/wireless/realtek/rtw88/rtw8822c.c:5313:22: warning: symbol 'rtw8822c_hw_spec' was not declared. Should it be static?
The warning arises because the external declaration for rtw8822c_hw_spec
occurs in rtw8822ce.h, which is not included in rtw8822c.h. That line is
moved, and the now empty file rtw8822ce.h is deleted.
Symbol 'rtw8822c_hw_spec' can be made constant.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
v2 Change patch subjects as recommended by Kalle
v3 Make the correct fix for the warnings - 'static' is incorrect, but const is correct
---
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822c.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8822ce.h | 10 ----------
4 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index c043b5c520b9..09f9e4adcf34 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -5310,7 +5310,7 @@ static const struct rtw_reg_domain coex_info_hw_regs_8822c[] = {
{0xc50, MASKBYTE0, RTW_REG_DOMAIN_MAC8},
};
-struct rtw_chip_info rtw8822c_hw_spec = {
+const struct rtw_chip_info rtw8822c_hw_spec = {
.ops = &rtw8822c_ops,
.id = RTW_CHIP_TYPE_8822C,
.fw_name = "rtw88/rtw8822c_fw.bin",
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
index 8201955e1f21..479d5d769c52 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
@@ -118,6 +118,8 @@ enum rtw8822c_dpk_one_shot_action {
void rtw8822c_parse_tbl_dpk(struct rtw_dev *rtwdev,
const struct rtw_table *tbl);
+extern const struct rtw_chip_info rtw8822c_hw_spec;
+
#define RTW_DECL_TABLE_DPK(name) \
const struct rtw_table name ## _tbl = { \
.data = name, \
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822ce.c b/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
index 3845b1333dc3..e26c6bc82936 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822ce.c
@@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include "pci.h"
-#include "rtw8822ce.h"
+#include "rtw8822c.h"
static const struct pci_device_id rtw_8822ce_id_table[] = {
{
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822ce.h b/drivers/net/wireless/realtek/rtw88/rtw8822ce.h
deleted file mode 100644
index fee32d7a4504..000000000000
--- a/drivers/net/wireless/realtek/rtw88/rtw8822ce.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2018-2019 Realtek Corporation
- */
-
-#ifndef __RTW_8822CE_H_
-#define __RTW_8822CE_H_
-
-extern struct rtw_chip_info rtw8822c_hw_spec;
-
-#endif
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/4] rtw88: Fix Sparse warning for rtw8723d_hw_spec
2022-05-24 15:36 [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Larry Finger
2022-05-24 15:36 ` [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec Larry Finger
2022-05-24 15:36 ` [PATCH v3 2/4] rtw88: Fix Sparse warning for rtw8822c_hw_spec Larry Finger
@ 2022-05-24 15:36 ` Larry Finger
2022-05-25 0:18 ` [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Ping-Ke Shih
3 siblings, 0 replies; 6+ messages in thread
From: Larry Finger @ 2022-05-24 15:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: Johannes Berg, linux-wireless, Larry Finger, Ping-Ke Shih
Sparse lists the following:
CHECK drivers/net/wireless/realtek/rtw88/rtw8723d.c
drivers/net/wireless/realtek/rtw88/rtw8723d.c:2704:22: warning: symbol 'rtw8723d_hw_spec' was not declared. Should it be static?
The warning arises because the external declaration for rtw8723d_hw_spec
occurs in rtw8723de.h, which is not included in rtw8723d.h. That line is
moved, and the now empty file rtw8723de.h is deleted.
Symbol 'rtw8723d_hw_spec' can be made constant.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
v2 Change patch subjects as recommended by Kalle
v3 Make the correct fix for the warnings - 'static' is incorrect, but const is correct
---
drivers/net/wireless/realtek/rtw88/rtw8723d.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8723d.h | 2 ++
drivers/net/wireless/realtek/rtw88/rtw8723de.c | 2 +-
drivers/net/wireless/realtek/rtw88/rtw8723de.h | 10 ----------
4 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index 93cce44df531..993bd6b1d723 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -2701,7 +2701,7 @@ static const struct rtw_reg_domain coex_info_hw_regs_8723d[] = {
{0x953, BIT(1), RTW_REG_DOMAIN_MAC8},
};
-struct rtw_chip_info rtw8723d_hw_spec = {
+const struct rtw_chip_info rtw8723d_hw_spec = {
.ops = &rtw8723d_ops,
.id = RTW_CHIP_TYPE_8723D,
.fw_name = "rtw88/rtw8723d_fw.bin",
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.h b/drivers/net/wireless/realtek/rtw88/rtw8723d.h
index 41d35174a542..4641f6e047b4 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.h
@@ -72,6 +72,8 @@ struct rtw8723d_efuse {
struct rtw8723de_efuse e;
};
+extern const struct rtw_chip_info rtw8723d_hw_spec;
+
/* phy status page0 */
#define GET_PHY_STAT_P0_PWDB(phy_stat) \
le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8))
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723de.c b/drivers/net/wireless/realtek/rtw88/rtw8723de.c
index 2dd689441e8d..abbaafa32851 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8723de.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723de.c
@@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include "pci.h"
-#include "rtw8723de.h"
+#include "rtw8723d.h"
static const struct pci_device_id rtw_8723de_id_table[] = {
{
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723de.h b/drivers/net/wireless/realtek/rtw88/rtw8723de.h
deleted file mode 100644
index 2b4894846a07..000000000000
--- a/drivers/net/wireless/realtek/rtw88/rtw8723de.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2018-2019 Realtek Corporation
- */
-
-#ifndef __RTW_8723DE_H_
-#define __RTW_8723DE_H_
-
-extern struct rtw_chip_info rtw8723d_hw_spec;
-
-#endif
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH v3 0/4] rtw88: Fix some Sparse Warnings
2022-05-24 15:36 [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Larry Finger
` (2 preceding siblings ...)
2022-05-24 15:36 ` [PATCH v3 3/4] rtw88: Fix Sparse warning for rtw8723d_hw_spec Larry Finger
@ 2022-05-25 0:18 ` Ping-Ke Shih
3 siblings, 0 replies; 6+ messages in thread
From: Ping-Ke Shih @ 2022-05-25 0:18 UTC (permalink / raw)
To: Larry Finger, Kalle Valo; +Cc: Johannes Berg, linux-wireless
> -----Original Message-----
> From: Larry Finger <Larry.Finger@lwfinger.net>
> Sent: Tuesday, May 24, 2022 11:36 PM
> To: Kalle Valo <kvalo@kernel.org>
> Cc: Johannes Berg <johannes@sipsolutions.net>; linux-wireless@vger.kernel.org; Larry Finger
> <Larry.Finger@lwfinger.net>; Ping-Ke Shih <pkshih@realtek.com>
> Subject: [PATCH v3 0/4] rtw88: Fix some Sparse Warnings
>
> Sparse shows warnings for symbols that can be static. In these cases.
> the wrong solution is suggested - again reinforcing the concept
> that all tools may suggest the wrong answer, and must be checked.
>
> Constify all *_hw_spec variables
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This patchset looks good to me. Thanks!
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [v3,1/4] wifi: rtw88: Fix sparse warning for rtw8822b_hw_spec
2022-05-24 15:36 ` [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec Larry Finger
@ 2022-05-30 11:06 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2022-05-30 11:06 UTC (permalink / raw)
To: Larry Finger; +Cc: Johannes Berg, linux-wireless, Larry Finger, Ping-Ke Shih
Larry Finger <Larry.Finger@lwfinger.net> wrote:
> Sparse lists the following for rtw88:
>
> CHECK drivers/net/wireless/realtek/rtw88/rtw8822b.c
> drivers/net/wireless/realtek/rtw88/rtw8822b.c:2500:22: warning: symbol 'rtw8822b_hw_spec' was not declared. Should it be static?
>
> The warning arises because the external declaration for rtw8822b_hw_spec
> occurs in rtw8822be.h, which is not included in rtw8822b.h. That line is
> moved, and the now empty file rtw8822be.h is deleted.
>
> Symbol 'rtw8822b_hw_spec' can be made constant.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Ping-Ke Shih <pkshih@realtek.com>
4 patches applied to wireless-next.git, thanks.
f429298d68fb wifi: rtw88: Fix sparse warning for rtw8822b_hw_spec
f86fc57f8ae3 wifi: rtw88: Fix Sparse warning for rtw8822c_hw_spec
e36db29cfdff wifi: rtw88: Fix Sparse warning for rtw8723d_hw_spec
89d8f53ff6e7 wifi: rtw88: Fix Sparse warning for rtw8821c_hw_spec
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220524153621.19027-2-Larry.Finger@lwfinger.net/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-30 11:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-24 15:36 [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Larry Finger
2022-05-24 15:36 ` [PATCH v3 1/4] rtw88: Fix sparse warning for rtw8822b_hw_spec Larry Finger
2022-05-30 11:06 ` [v3,1/4] wifi: " Kalle Valo
2022-05-24 15:36 ` [PATCH v3 2/4] rtw88: Fix Sparse warning for rtw8822c_hw_spec Larry Finger
2022-05-24 15:36 ` [PATCH v3 3/4] rtw88: Fix Sparse warning for rtw8723d_hw_spec Larry Finger
2022-05-25 0:18 ` [PATCH v3 0/4] rtw88: Fix some Sparse Warnings Ping-Ke Shih
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.