Commit f86fc57f authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220524153621.19027-3-Larry.Finger@lwfinger.net
parent f429298d
...@@ -5310,7 +5310,7 @@ static const struct rtw_reg_domain coex_info_hw_regs_8822c[] = { ...@@ -5310,7 +5310,7 @@ static const struct rtw_reg_domain coex_info_hw_regs_8822c[] = {
{0xc50, MASKBYTE0, RTW_REG_DOMAIN_MAC8}, {0xc50, MASKBYTE0, RTW_REG_DOMAIN_MAC8},
}; };
struct rtw_chip_info rtw8822c_hw_spec = { const struct rtw_chip_info rtw8822c_hw_spec = {
.ops = &rtw8822c_ops, .ops = &rtw8822c_ops,
.id = RTW_CHIP_TYPE_8822C, .id = RTW_CHIP_TYPE_8822C,
.fw_name = "rtw88/rtw8822c_fw.bin", .fw_name = "rtw88/rtw8822c_fw.bin",
......
...@@ -118,6 +118,8 @@ enum rtw8822c_dpk_one_shot_action { ...@@ -118,6 +118,8 @@ enum rtw8822c_dpk_one_shot_action {
void rtw8822c_parse_tbl_dpk(struct rtw_dev *rtwdev, void rtw8822c_parse_tbl_dpk(struct rtw_dev *rtwdev,
const struct rtw_table *tbl); const struct rtw_table *tbl);
extern const struct rtw_chip_info rtw8822c_hw_spec;
#define RTW_DECL_TABLE_DPK(name) \ #define RTW_DECL_TABLE_DPK(name) \
const struct rtw_table name ## _tbl = { \ const struct rtw_table name ## _tbl = { \
.data = name, \ .data = name, \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "pci.h" #include "pci.h"
#include "rtw8822ce.h" #include "rtw8822c.h"
static const struct pci_device_id rtw_8822ce_id_table[] = { static const struct pci_device_id rtw_8822ce_id_table[] = {
{ {
......
/* 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment