mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
25e60a726b
* sunxi-5.18: rebase megous patces to v5.18.3 * sunxi-5.18: Add upstream patches - tag: orange-pi-5.18-20220609-1318 * Check applicability to version 5.18.3 * sunxi-5.18: switch to version 5.18.3
86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
From fb978627fc0416048179dea30c98a40bd791f4dc Mon Sep 17 00:00:00 2001
|
|
From: Larry Finger <Larry.Finger@lwfinger.net>
|
|
Date: Tue, 24 May 2022 10:36:19 -0500
|
|
Subject: [PATCH 529/533] wifi: rtw88: Fix Sparse warning for rtw8822c_hw_spec
|
|
|
|
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>
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/20220524153621.19027-3-Larry.Finger@lwfinger.net
|
|
---
|
|
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.35.3
|
|
|