From patchwork Tue Nov 8 09:34:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "liwei (GF)" X-Patchwork-Id: 13036076 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72FFBC433FE for ; Tue, 8 Nov 2022 09:36:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233762AbiKHJgP (ORCPT ); Tue, 8 Nov 2022 04:36:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233723AbiKHJgK (ORCPT ); Tue, 8 Nov 2022 04:36:10 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED6B521E20; Tue, 8 Nov 2022 01:36:08 -0800 (PST) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N62yz3Mm9zmVl0; Tue, 8 Nov 2022 17:35:55 +0800 (CST) Received: from localhost.localdomain (10.175.103.91) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 17:36:06 +0800 From: Wei Li To: Ping-Ke Shih , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: , , Subject: [PATCH v1 1/3] rtlwifi: rtl8188ee: Correct the header guard of rtl8188ee/*.h Date: Tue, 8 Nov 2022 17:34:45 +0800 Message-ID: <20221108093447.3588889-2-liwei391@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221108093447.3588889-1-liwei391@huawei.com> References: <20221108093447.3588889-1-liwei391@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The header guard of rtl8188ee/*.h now is promiscuous. Rename to __RTL88EE_* that corresponding with the module name. Fixes: f0eb856e0b6c ("rtlwifi: rtl8188ee: Add new driver") Signed-off-by: Wei Li --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h index edcca42c7464..2f88a6faf535 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_DEF_H__ -#define __RTL92C_DEF_H__ +#ifndef __RTL88EE_DEF_H__ +#define __RTL88EE_DEF_H__ #define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0 #define HAL_PRIME_CHNL_OFFSET_LOWER 1 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h index eb8090caeec2..1573d277a920 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL88E_DM_H__ -#define __RTL88E_DM_H__ +#ifndef __RTL88EE_DM_H__ +#define __RTL88EE_DM_H__ #define MAIN_ANT 0 #define AUX_ANT 1 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h index 79f095e47d71..863ddcd98202 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C__FW__H__ -#define __RTL92C__FW__H__ +#ifndef __RTL88EE__FW__H__ +#define __RTL88EE__FW__H__ #define FW_8192C_SIZE 0x8000 #define FW_8192C_START_ADDRESS 0x1000 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h index fd09b0712d17..3140b6938ffd 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_HW_H__ -#define __RTL92CE_HW_H__ +#ifndef __RTL88EE_HW_H__ +#define __RTL88EE_HW_H__ void rtl88ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val); void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h index 67d3dc389ba0..da8a1af3606d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL88EE_LED_H__ +#define __RTL88EE_LED_H__ void rtl88ee_init_sw_leds(struct ieee80211_hw *hw); void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h index 8157ef419eeb..1fa9fd0d472a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_PHY_H__ -#define __RTL92C_PHY_H__ +#ifndef __RTL88EE_PHY_H__ +#define __RTL88EE_PHY_H__ /* MAX_TX_COUNT must always set to 4, otherwise read efuse * table secquence will be wrong. diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h index 42e222c1795f..e1d6df65c5c4 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL8723E_PWRSEQ_H__ -#define __RTL8723E_PWRSEQ_H__ +#ifndef __RTL88EE_PWRSEQ_H__ +#define __RTL88EE_PWRSEQ_H__ #include "../pwrseqcmd.h" /* Check document WM-20110607-Paul-RTL8188EE_Power_Architecture-R02.vsd diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h index 0fc8db8916fa..6392f2e24ac1 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_REG_H__ -#define __RTL92C_REG_H__ +#ifndef __RTL88EE_REG_H__ +#define __RTL88EE_REG_H__ #define TXPKT_BUF_SELECT 0x69 #define RXPKT_BUF_SELECT 0xA5 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h index 05e27b40b2a9..76cb4cd2b5a2 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_RF_H__ -#define __RTL92C_RF_H__ +#ifndef __RTL88EE_RF_H__ +#define __RTL88EE_RF_H__ #define RF6052_MAX_TX_PWR 0x3F diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h index df6065602401..dd4eee147b4c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_TABLE__H_ -#define __RTL92CE_TABLE__H_ +#ifndef __RTL88EE_TABLE__H_ +#define __RTL88EE_TABLE__H_ #include #define RTL8188EEPHY_REG_1TARRAYLEN 382 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h index e17f70b4d199..025087026068 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_TRX_H__ -#define __RTL92CE_TRX_H__ +#ifndef __RTL88EE_TRX_H__ +#define __RTL88EE_TRX_H__ #define TX_DESC_SIZE 64 #define TX_DESC_AGGR_SUBFRAME_SIZE 32