Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp456058rwb; Wed, 9 Nov 2022 04:55:31 -0800 (PST) X-Google-Smtp-Source: AMsMyM5muPjjDs1a4Nnhb6swHq6zZDuhAHHLt2V0QqLM9otxNNX2ZCLlJ4mi0LvdigLWoXJEykmU X-Received: by 2002:aa7:c7d1:0:b0:461:2a82:497e with SMTP id o17-20020aa7c7d1000000b004612a82497emr60910556eds.267.1667998531339; Wed, 09 Nov 2022 04:55:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667998531; cv=none; d=google.com; s=arc-20160816; b=uAWWdLvI9hh2fh9j+yzw6ap+9eFLsIF+UIsRKXyeXfZ6Ci+qKM01g/5pkk1KlRyhwt IeNrrhnQEDUIkDpxCR6fMKdgP6BPmC2eif3TqD4CaNFxSnaXlLWJ79E7JhgaRg2DaCtl SfYJD7lYpz6606Q+n4G6yOA4HG+QnyErLHCfBF+va/j/vt49CMLv91W7w2ZmjysA66ao eZHBnwyrH+MZ1t/nbvXXNy23hUNTVMY/eBlrM/TDIBiJ5PieJXhPp2dfwhe1rz78bkyl H/2p0f09y1/7TTFbX43uKNS6iMB9D5x3Dgc3UoxbnvONR8Zewhbmw4+P5izueENf2YSS S3cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=s1g51e3JIhyleQWQ/EgF36XWZZhnayqJzJ7YQiPPbHo=; b=AuhKdILIs3NOgpGslC+J+7V+oY3jvcuZn9LiO+xFD5HIMAqR1w81bu/Rhs/P5SKA86 EDsHlz1+fI/zR8/K9xAE5hb79F2SpJRxSrAqdI+o8TDZKJTVz6GPRO1kcr/yxZR7KZnP 9LCU41sJiMgJUGPOfmxI0Rr39cWpktZVHE72q01M8ASuWcC5/gbLbwgJFI6Todj1KYvt aNbCKUQ3XJ2PmVN912v6Q7GLKc5LUw6WhyvLClKGS7+vQny2AvbCKQfQ3pTrEQrrmbfz nRb/mctpSAG47lLUttHX8qhQscRDJJIEUrIbJnOZlarjrfemfe6PTME/uwkk/LFRMhIM uUUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g23-20020a50d0d7000000b00461d02225a3si12606670edf.448.2022.11.09.04.55.10; Wed, 09 Nov 2022 04:55:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229615AbiKIMqP (ORCPT + 66 others); Wed, 9 Nov 2022 07:46:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229880AbiKIMqO (ORCPT ); Wed, 9 Nov 2022 07:46:14 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B5912CDF5; Wed, 9 Nov 2022 04:46:12 -0800 (PST) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N6l4Y18F1zJnDr; Wed, 9 Nov 2022 20:43:09 +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; Wed, 9 Nov 2022 20:46:10 +0800 From: Wei Li To: Ping-Ke Shih , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: , , Subject: [PATCH v2] wifi: rtlwifi: Correct header guards of rtl8188ee/rtl8723ae/rtl8192de Date: Wed, 9 Nov 2022 20:44:45 +0800 Message-ID: <20221109124445.3246937-1-liwei391@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The header guards of rtl8188ee/rtl8723ae/rtl8192de are promiscuous currently. Rename them to be consistent with their module names. Fixes: f0eb856e0b6c ("rtlwifi: rtl8188ee: Add new driver") Fixes: c592e631bcec ("rtlwifi: rtl8723ae: Add new driver") Fixes: 4f01358e5b8a ("rtlwifi: rtl8192de: Merge dynamic management routines") 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 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- 16 files changed, 32 insertions(+), 32 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 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h index 939cc45bfebd..9cd9070a0281 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C_DM_H__ -#define __RTL92C_DM_H__ +#ifndef __RTL92D_DM_H__ +#define __RTL92D_DM_H__ #define HAL_DM_DIG_DISABLE BIT(0) #define HAL_DM_HIPWR_DISABLE BIT(1) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h index 7599c7e5ecc3..71239a24f2c7 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL92DE_LED_H__ +#define __RTL92DE_LED_H__ void rtl92de_init_sw_leds(struct ieee80211_hw *hw); void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h index 3f9ed9b4428e..3ab4a7389012 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C__FW__H__ -#define __RTL92C__FW__H__ +#ifndef __RTL8723E__FW__H__ +#define __RTL8723E__FW__H__ #define FW_8192C_SIZE 0x3000 #define FW_8192C_START_ADDRESS 0x1000 diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h index 9f85845d23cd..372f02409dda 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL8723E_LED_H__ +#define __RTL8723E_LED_H__ void rtl8723e_init_sw_leds(struct ieee80211_hw *hw); void rtl8723e_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h index 98bfe02f66d5..40c89095fd57 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C_PHY_H__ -#define __RTL92C_PHY_H__ +#ifndef __RTL8723E_PHY_H__ +#define __RTL8723E_PHY_H__ #define MAX_PRECMD_CNT 16 #define MAX_RFDEPENDCMD_CNT 16 -- 2.25.1