* [PATCH 1/9] rtlwifi: rtl8192cu: Fix typo
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2020-01-26 15:40 ` Kalle Valo
2019-12-23 12:37 ` [PATCH 2/9] rtlwifi: rtl8188ee: Make functions static & rm sw.h Amadeusz Sławiński
` (8 subsequent siblings)
9 siblings, 1 reply; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Replace USB_VENDER_ID_REALTEK with USB_VENDOR_ID_REALTEK.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
.../wireless/realtek/rtlwifi/rtl8192cu/sw.c | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
index ab3e4aebad39..6b954059e830 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
@@ -252,45 +252,45 @@ static struct rtl_hal_cfg rtl92cu_hal_cfg = {
.maps[RTL_RC_HT_RATEMCS15] = DESC_RATEMCS15,
};
-#define USB_VENDER_ID_REALTEK 0x0bda
+#define USB_VENDOR_ID_REALTEK 0x0bda
/* 2010-10-19 DID_USB_V3.4 */
static const struct usb_device_id rtl8192c_usb_ids[] = {
/*=== Realtek demoboard ===*/
/* Default ID */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8191, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8191, rtl92cu_hal_cfg)},
/****** 8188CU ********/
/* RTL8188CTV */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x018a, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x018a, rtl92cu_hal_cfg)},
/* 8188CE-VAU USB minCard */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8170, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8170, rtl92cu_hal_cfg)},
/* 8188cu 1*1 dongle */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8176, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8176, rtl92cu_hal_cfg)},
/* 8188cu 1*1 dongle, (b/g mode only) */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8177, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8177, rtl92cu_hal_cfg)},
/* 8188cu Slim Solo */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817a, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817a, rtl92cu_hal_cfg)},
/* 8188cu Slim Combo */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817b, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817b, rtl92cu_hal_cfg)},
/* 8188RU High-power USB Dongle */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817d, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817d, rtl92cu_hal_cfg)},
/* 8188CE-VAU USB minCard (b/g mode only) */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817e, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817e, rtl92cu_hal_cfg)},
/* 8188RU in Alfa AWUS036NHR */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
/* RTL8188CUS-VL */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
/* 8188 Combo for BC4 */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
/****** 8192CU ********/
/* 8192cu 2*2 */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8178, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8178, rtl92cu_hal_cfg)},
/* 8192CE-VAU USB minCard */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817c, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x817c, rtl92cu_hal_cfg)},
/*=== Customer ID ===*/
/****** 8188CU ********/
@@ -329,7 +329,7 @@ static const struct usb_device_id rtl8192c_usb_ids[] = {
/****** 8188 RU ********/
/* Netcore */
- {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x317f, rtl92cu_hal_cfg)},
+ {RTL_USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x317f, rtl92cu_hal_cfg)},
/****** 8188CUS Slim Solo********/
{RTL_USB_DEVICE(0x04f2, 0xaff7, rtl92cu_hal_cfg)}, /*Xavi*/
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/9] rtlwifi: rtl8188ee: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 1/9] rtlwifi: rtl8192cu: Fix typo Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 3/9] rtlwifi: rtl8192ce: " Amadeusz Sławiński
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. This makes sw.h unnecessary, so remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 7 +++----
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h | 12 ------------
2 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
index a0eda51e833c..4865639ac9ea 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
@@ -9,7 +9,6 @@
#include "phy.h"
#include "dm.h"
#include "hw.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
#include "table.h"
@@ -59,7 +58,7 @@ static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw)
rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;
}
-int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
{
int err = 0;
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -173,7 +172,7 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
return err;
}
-void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -189,7 +188,7 @@ void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw)
}
/* get bt coexist status */
-bool rtl88e_get_btc_status(void)
+static bool rtl88e_get_btc_status(void)
{
return false;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
deleted file mode 100644
index 1407151503f8..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2013 Realtek Corporation.*/
-
-#ifndef __RTL92CE_SW_H__
-#define __RTL92CE_SW_H__
-
-int rtl88e_init_sw_vars(struct ieee80211_hw *hw);
-void rtl88e_deinit_sw_vars(struct ieee80211_hw *hw);
-bool rtl88e_get_btc_status(void);
-
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/9] rtlwifi: rtl8192ce: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 1/9] rtlwifi: rtl8192cu: Fix typo Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 2/9] rtlwifi: rtl8188ee: Make functions static & rm sw.h Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 4/9] rtlwifi: rtl8192cu: Remove sw.h header Amadeusz Sławiński
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. The rtl92c_init_var_map function is not defined
anywhere, while declared in sw.h. Two other functions are also declared
in phy.h (which is included in sw.c) and their definitions are in phy.c
Overall sw.h is unnecessary and can be removed.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
.../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 5 ++---
.../net/wireless/realtek/rtlwifi/rtl8192ce/sw.h | 15 ---------------
2 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
index 900788e4018c..ed68c850f9a2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
@@ -14,7 +14,6 @@
#include "../rtl8192c/phy_common.h"
#include "hw.h"
#include "rf.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
@@ -65,7 +64,7 @@ static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw)
rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;
}
-int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
{
int err;
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -161,7 +160,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
return 0;
}
-void rtl92c_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl92c_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
deleted file mode 100644
index f2d121a60159..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2012 Realtek Corporation.*/
-
-#ifndef __RTL92CE_SW_H__
-#define __RTL92CE_SW_H__
-
-int rtl92c_init_sw_vars(struct ieee80211_hw *hw);
-void rtl92c_deinit_sw_vars(struct ieee80211_hw *hw);
-void rtl92c_init_var_map(struct ieee80211_hw *hw);
-bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
- u8 configtype);
-bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
- u8 configtype);
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/9] rtlwifi: rtl8192cu: Remove sw.h header
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (2 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 3/9] rtlwifi: rtl8192ce: " Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 5/9] rtlwifi: rtl8192ee: Make functions static & rm sw.h Amadeusz Sławiński
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
It has one define, which is already defined in include from reg.h.
All functions are declared in their own headers and included in *.c
files belonging to them.
This makes sw.h unnecessary, so we can remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
.../wireless/realtek/rtlwifi/rtl8192cu/sw.c | 1 -
.../wireless/realtek/rtlwifi/rtl8192cu/sw.h | 27 -------------------
2 files changed, 28 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
index 6b954059e830..b53daf1b29f7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
@@ -12,7 +12,6 @@
#include "mac.h"
#include "dm.h"
#include "rf.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
#include "hw.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
deleted file mode 100644
index 662440c4cdc9..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2012 Realtek Corporation.*/
-
-#ifndef __RTL92CU_SW_H__
-#define __RTL92CU_SW_H__
-
-#define EFUSE_MAX_SECTION 16
-
-void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
- u8 *powerlevel);
-void rtl92cu_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
- u8 *ppowerlevel, u8 channel);
-bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
- u8 configtype);
-bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
- u8 configtype);
-void _rtl92cu_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t);
-void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
- enum radio_path rfpath,
- u32 regaddr, u32 bitmask, u32 data);
-bool rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
- enum rf_pwrstate rfpwr_state);
-u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
- enum radio_path rfpath, u32 regaddr, u32 bitmask);
-void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw);
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/9] rtlwifi: rtl8192ee: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (3 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 4/9] rtlwifi: rtl8192cu: Remove sw.h header Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 6/9] rtlwifi: rtl8192se: Remove sw.h header Amadeusz Sławiński
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. This makes sw.h unnecessary, so remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 7 +++----
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h | 11 -----------
2 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
index b6ee7dae5943..b337d599b6f4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
@@ -9,7 +9,6 @@
#include "phy.h"
#include "dm.h"
#include "hw.h"
-#include "sw.h"
#include "fw.h"
#include "trx.h"
#include "led.h"
@@ -65,7 +64,7 @@ static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw)
rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;
}
-int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -164,7 +163,7 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
return 0;
}
-void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -175,7 +174,7 @@ void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw)
}
/* get bt coexist status */
-bool rtl92ee_get_btc_status(void)
+static bool rtl92ee_get_btc_status(void)
{
return true;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
deleted file mode 100644
index 36e29a2da0fd..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2014 Realtek Corporation.*/
-
-#ifndef __RTL92E_SW_H__
-#define __RTL92E_SW_H__
-
-int rtl92ee_init_sw_vars(struct ieee80211_hw *hw);
-void rtl92ee_deinit_sw_vars(struct ieee80211_hw *hw);
-bool rtl92ee_get_btc_status(void);
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/9] rtlwifi: rtl8192se: Remove sw.h header
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (4 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 5/9] rtlwifi: rtl8192ee: Make functions static & rm sw.h Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 7/9] rtlwifi: rtl8723ae: Make functions static & rm sw.h Amadeusz Sławiński
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
It has one define, which is already defined in include from reg.h.
All the declared functions are not implemented anywhere, sw.c has
ones with similar names which are already static.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 1 -
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h | 13 -------------
2 files changed, 14 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
index 1c7ee569f4bf..7a54497b7df2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
@@ -11,7 +11,6 @@
#include "dm.h"
#include "fw.h"
#include "hw.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
deleted file mode 100644
index a31efba0e6b5..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2012 Realtek Corporation.*/
-
-#ifndef __REALTEK_PCI92SE_SW_H__
-#define __REALTEK_PCI92SE_SW_H__
-
-#define EFUSE_MAX_SECTION 16
-
-int rtl92se_init_sw(struct ieee80211_hw *hw);
-void rtl92se_deinit_sw(struct ieee80211_hw *hw);
-void rtl92se_init_var_map(struct ieee80211_hw *hw);
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 7/9] rtlwifi: rtl8723ae: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (5 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 6/9] rtlwifi: rtl8192se: Remove sw.h header Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 8/9] rtlwifi: rtl8723be: " Amadeusz Sławiński
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. This makes sw.h unnecessary, so remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 7 +++----
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h | 13 -------------
2 files changed, 3 insertions(+), 17 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
index 5702ac6deebf..ea86d5bf33d2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
@@ -11,7 +11,6 @@
#include "fw.h"
#include "../rtl8723com/fw_common.h"
#include "hw.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
#include "table.h"
@@ -67,7 +66,7 @@ static void rtl8723e_init_aspm_vars(struct ieee80211_hw *hw)
rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;
}
-int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -166,7 +165,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
return 0;
}
-void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -177,7 +176,7 @@ void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw)
}
/* get bt coexist status */
-bool rtl8723e_get_btc_status(void)
+static bool rtl8723e_get_btc_status(void)
{
return true;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
deleted file mode 100644
index 200ce39a0dd7..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2012 Realtek Corporation.*/
-
-#ifndef __RTL8723E_SW_H__
-#define __RTL8723E_SW_H__
-
-int rtl8723e_init_sw_vars(struct ieee80211_hw *hw);
-void rtl8723e_deinit_sw_vars(struct ieee80211_hw *hw);
-void rtl8723e_init_var_map(struct ieee80211_hw *hw);
-bool rtl8723e_get_btc_status(void);
-
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 8/9] rtlwifi: rtl8723be: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (6 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 7/9] rtlwifi: rtl8723ae: Make functions static & rm sw.h Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-23 12:37 ` [PATCH 9/9] rtlwifi: rtl8821ae: " Amadeusz Sławiński
2019-12-24 1:57 ` [PATCH 0/9] rtlwifi: Cleanups Pkshih
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. This makes sw.h unnecessary, so remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 7 +++----
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h | 13 -------------
2 files changed, 3 insertions(+), 17 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index 3c8528f0ecb3..36209ac5b208 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -13,7 +13,6 @@
#include "hw.h"
#include "fw.h"
#include "../rtl8723com/fw_common.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
#include "table.h"
@@ -64,7 +63,7 @@ static void rtl8723be_init_aspm_vars(struct ieee80211_hw *hw)
rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;
}
-int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
{
int err = 0;
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -170,7 +169,7 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
return 0;
}
-void rtl8723be_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl8723be_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -181,7 +180,7 @@ void rtl8723be_deinit_sw_vars(struct ieee80211_hw *hw)
}
/* get bt coexist status */
-bool rtl8723be_get_btc_status(void)
+static bool rtl8723be_get_btc_status(void)
{
return true;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
deleted file mode 100644
index 6ecacf9fbfd7..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2014 Realtek Corporation.*/
-
-#ifndef __RTL8723BE_SW_H__
-#define __RTL8723BE_SW_H__
-
-int rtl8723be_init_sw_vars(struct ieee80211_hw *hw);
-void rtl8723be_deinit_sw_vars(struct ieee80211_hw *hw);
-void rtl8723be_init_var_map(struct ieee80211_hw *hw);
-bool rtl8723be_get_btc_status(void);
-
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 9/9] rtlwifi: rtl8821ae: Make functions static & rm sw.h
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (7 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 8/9] rtlwifi: rtl8723be: " Amadeusz Sławiński
@ 2019-12-23 12:37 ` Amadeusz Sławiński
2019-12-24 1:57 ` [PATCH 0/9] rtlwifi: Cleanups Pkshih
9 siblings, 0 replies; 12+ messages in thread
From: Amadeusz Sławiński @ 2019-12-23 12:37 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo
Cc: David S . Miller, Larry Finger, linux-kernel, linux-wireless,
netdev, Amadeusz Sławiński
Some of functions which were exposed in sw.h, are only used in sw.c, so
just make them static. This makes sw.h unnecessary, so remove it.
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 7 +++----
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h | 12 ------------
2 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index 3def6a2b3450..d8df816753cb 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -10,7 +10,6 @@
#include "dm.h"
#include "hw.h"
#include "fw.h"
-#include "sw.h"
#include "trx.h"
#include "led.h"
#include "table.h"
@@ -65,7 +64,7 @@ static void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw)
}
/*InitializeVariables8812E*/
-int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
+static int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
{
int err = 0;
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -211,7 +210,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
return 0;
}
-void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw)
+static void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -228,7 +227,7 @@ void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw)
}
/* get bt coexist status */
-bool rtl8821ae_get_btc_status(void)
+static bool rtl8821ae_get_btc_status(void)
{
return true;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
deleted file mode 100644
index 9d7610f84b20..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2009-2010 Realtek Corporation.*/
-
-#ifndef __RTL8821AE_SW_H__
-#define __RTL8821AE_SW_H__
-
-int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw);
-void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw);
-void rtl8821ae_init_var_map(struct ieee80211_hw *hw);
-bool rtl8821ae_get_btc_status(void);
-
-#endif
--
2.24.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/9] rtlwifi: Cleanups
2019-12-23 12:37 [PATCH 0/9] rtlwifi: Cleanups Amadeusz Sławiński
` (8 preceding siblings ...)
2019-12-23 12:37 ` [PATCH 9/9] rtlwifi: rtl8821ae: " Amadeusz Sławiński
@ 2019-12-24 1:57 ` Pkshih
9 siblings, 0 replies; 12+ messages in thread
From: Pkshih @ 2019-12-24 1:57 UTC (permalink / raw)
To: amade@asmblr.net, kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org, davem@davemloft.net,
linux-kernel@vger.kernel.org, Larry.Finger@lwfinger.net,
netdev@vger.kernel.org
On Mon, 2019-12-23 at 13:37 +0100, Amadeusz Sławiński wrote:
> Start from fixing a typo error, then move onto making series of
> functions static and removing unnecessary header.
>
> Amadeusz Sławiński (9):
> rtlwifi: rtl8192cu: Fix typo
> rtlwifi: rtl8188ee: Make functions static & rm sw.h
> rtlwifi: rtl8192ce: Make functions static & rm sw.h
> rtlwifi: rtl8192cu: Remove sw.h header
> rtlwifi: rtl8192ee: Make functions static & rm sw.h
> rtlwifi: rtl8192se: Remove sw.h header
> rtlwifi: rtl8723ae: Make functions static & rm sw.h
> rtlwifi: rtl8723be: Make functions static & rm sw.h
> rtlwifi: rtl8821ae: Make functions static & rm sw.h
>
> .../wireless/realtek/rtlwifi/rtl8188ee/sw.c | 7 ++--
> .../wireless/realtek/rtlwifi/rtl8188ee/sw.h | 12 -------
> .../wireless/realtek/rtlwifi/rtl8192ce/sw.c | 5 ++-
> .../wireless/realtek/rtlwifi/rtl8192ce/sw.h | 15 --------
> .../wireless/realtek/rtlwifi/rtl8192cu/sw.c | 35 +++++++++----------
> .../wireless/realtek/rtlwifi/rtl8192cu/sw.h | 27 --------------
> .../wireless/realtek/rtlwifi/rtl8192ee/sw.c | 7 ++--
> .../wireless/realtek/rtlwifi/rtl8192ee/sw.h | 11 ------
> .../wireless/realtek/rtlwifi/rtl8192se/sw.c | 1 -
> .../wireless/realtek/rtlwifi/rtl8192se/sw.h | 13 -------
> .../wireless/realtek/rtlwifi/rtl8723ae/sw.c | 7 ++--
> .../wireless/realtek/rtlwifi/rtl8723ae/sw.h | 13 -------
> .../wireless/realtek/rtlwifi/rtl8723be/sw.c | 7 ++--
> .../wireless/realtek/rtlwifi/rtl8723be/sw.h | 13 -------
> .../wireless/realtek/rtlwifi/rtl8821ae/sw.c | 7 ++--
> .../wireless/realtek/rtlwifi/rtl8821ae/sw.h | 12 -------
> 16 files changed, 34 insertions(+), 158 deletions(-)
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h
>
For all patches:
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Thanks.
^ permalink raw reply [flat|nested] 12+ messages in thread