rtw88: Fix Sparse warning for rtw8821c_hw_spec

lwfinger · lwfinger · commit dbcc43c31a45 · 2022-05-24T10:56:17.000-05:00
Sparse lists the following:

  CHECK   rtw8821c.c
rtw8821c.c:1880:22: warning: symbol 'rtw8821c_hw_spec' was not declared. Should it be static?

The warning arises because the external declaration for rtw8821c_hw_spec
occurs in rtw8821ce.h, which is not included in rtw8821c.h. That line is
moved, and the now empty file rtw8821ce.h is deleted.

Symbol 'rtw8821c_hw_spec' can be made constant.

Signed-off-by: Larry Finger &lt;Larry.Finger@lwfinger.net&gt;
diff --git a/rtw8821c.c b/rtw8821c.c
@@ -1875,7 +1875,7 @@ static const struct rtw_reg_domain coex_info_hw_regs_8821c[] = {
 	{0x60A, MASKBYTE0, RTW_REG_DOMAIN_MAC8},
 };
 
-struct rtw_chip_info rtw8821c_hw_spec = {
+const struct rtw_chip_info rtw8821c_hw_spec = {
 	.ops = &rtw8821c_ops,
 	.id = RTW_CHIP_TYPE_8821C,
 	.fw_name = "rtw88/rtw8821c_fw.bin",
diff --git a/rtw8821c.h b/rtw8821c.h
@@ -84,6 +84,8 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
 	rtw_write32_mask(rtwdev, addr + 0x200, mask, data);
 }
 
+extern const struct rtw_chip_info rtw8821c_hw_spec;
+
 #define rtw_write32s_mask(rtwdev, addr, mask, data)			       \
 	do {								       \
 		BUILD_BUG_ON((addr) < 0xC00 || (addr) >= 0xD00);	       \
diff --git a/rtw8821ce.c b/rtw8821ce.c
@@ -5,7 +5,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include "pci.h"
-#include "rtw8821ce.h"
+#include "rtw8821c.h"
 
 static const struct pci_device_id rtw_8821ce_id_table[] = {
 	{
diff --git a/rtw8821ce.h b/rtw8821ce.h

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)`
`84`	`84`	`rtw_write32_mask(rtwdev, addr + 0x200, mask, data);`
`85`	`85`	`}`
`86`	`86`
	`87`	`+extern const struct rtw_chip_info rtw8821c_hw_spec;`
	`88`	`+`
`87`	`89`	`#define rtw_write32s_mask(rtwdev, addr, mask, data) \`
`88`	`90`	`do { \`
`89`	`91`	`BUILD_BUG_ON((addr) < 0xC00 \|\| (addr) >= 0xD00); \`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <linux/module.h>`
`6`	`6`	`#include <linux/pci.h>`
`7`	`7`	`#include "pci.h"`
`8`		`-#include "rtw8821ce.h"`
	`8`	`+#include "rtw8821c.h"`
`9`	`9`
`10`	`10`	`static const struct pci_device_id rtw_8821ce_id_table[] = {`
`11`	`11`	`{`