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 <[email protected]>
---
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
> -----Original Message-----
> From: Larry Finger <[email protected]>
> Sent: Tuesday, May 24, 2022 11:36 PM
> To: Kalle Valo <[email protected]>
> Cc: Johannes Berg <[email protected]>; [email protected]; Larry Finger
> <[email protected]>; Ping-Ke Shih <[email protected]>
> 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 <[email protected]>
This patchset looks good to me. Thanks!
Acked-by: Ping-Ke Shih <[email protected]>
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 <[email protected]>
---
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