[PATCH v2] rtlwifi: remove set but unused variables
Remove set but unused variables from _rtl88ee_hw_configure() and
_rtl8723e_hw_configure().
Signed-off-by: Kevin Lo
---
v2: Correct my email address.
---
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 988d5ac57d02..cfc8762c55f4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -951,12 +951,8 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
static void _rtl88ee_hw_configure(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- u8 reg_bw_opmode;
- u32 reg_ratr, reg_prsr;
+ u32 reg_prsr;
- reg_bw_opmode = BW_OPMODE_20MHZ;
- reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
- RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index 545115db507e..f783e4a8083d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -799,11 +799,9 @@ static void _rtl8723e_hw_configure(struct ieee80211_hw *hw)
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 reg_bw_opmode;
- u32 reg_ratr, reg_prsr;
+ u32 reg_prsr;
reg_bw_opmode = BW_OPMODE_20MHZ;
- reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
- RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8);
[PATCH] rtlwifi: remove set but unused variables
Remove unused variables from _rtl88ee_hw_configure() and
_rtl8723e_hw_configure().
Signed-off-by: Kevin Lo
---
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 988d5ac57d02..cfc8762c55f4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -951,12 +951,8 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
static void _rtl88ee_hw_configure(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- u8 reg_bw_opmode;
- u32 reg_ratr, reg_prsr;
+ u32 reg_prsr;
- reg_bw_opmode = BW_OPMODE_20MHZ;
- reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
- RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
rtl_write_dword(rtlpriv, REG_RRSR, reg_prsr);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index 545115db507e..f783e4a8083d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -799,11 +799,9 @@ static void _rtl8723e_hw_configure(struct ieee80211_hw *hw)
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 reg_bw_opmode;
- u32 reg_ratr, reg_prsr;
+ u32 reg_prsr;
reg_bw_opmode = BW_OPMODE_20MHZ;
- reg_ratr = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
- RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
reg_prsr = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
rtl_write_byte(rtlpriv, REG_INIRTS_RATE_SEL, 0x8);
[PATCH] rtlwifi: correct comment
Correct comment. Set bit 3 and bit 4 of 0x0005 register (REG_APS_FSMCO + 1)
to 0 which means disable WL suspend, not enable WL suspend.
Signed-off-by: Kevin Lo
---
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
index f2d9c6116e5c..8379a3e5198c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
@@ -142,7 +142,7 @@
/*wait power state to suspend*/}, \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3) | BIT(4), 0 \
- /*0x04[12:11] = 2b'01enable WL suspend*/},
+ /*0x04[12:11] = 2b'00 disable WL suspend*/},
#define RTL8188EE_TRANS_CARDEMU_TO_CARDDIS \
{0x0026, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
@@ -179,7 +179,7 @@
/*wait power state to suspend*/}, \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0 \
- /*0x04[12:11] = 2b'01enable WL suspend*/},
+ /*0x04[12:11] = 2b'00 disable WL suspend*/},
#define RTL8188EE_TRANS_CARDEMU_TO_PDN \
{0x0006, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
index 781eeaa6af49..c570801508cc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
@@ -134,7 +134,7 @@
/*wait power state to suspend*/ \
{0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, \
PWR_BASEADDR_SDIO , PWR_CMD_POLLING, BIT(1), BIT(1)}, \
- /*0x04[12:11] = 2b'01enable WL suspend*/\
+ /*0x04[12:11] = 2b'00 disable WL suspend*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(3) | BIT(4), 0},
@@ -181,7 +181,7 @@
/*Lock small LDO Register*/ \
{0x00CC, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, \
PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(2), 0}, \
- /*0x04[12:11] = 2b'01enable WL suspend*/\
+ /*0x04[12:11] = 2b'00 disable WL suspend*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC , PWR_CMD_WRITE, BIT(3) | BIT(4), 0},
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
index 4ac7db526f15..e6c3aac3e9fd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
@@ -135,7 +135,7 @@
/*wait power state to suspend*/ \
{0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,\
PWR_BASEADDR_SDIO, PWR_CMD_POLLING, BIT(1), BIT(1)},\
- /*0x04[12:11] = 2b'01enable WL suspend*/ \
+ /*0x04[12:11] = 2b'00 disable WL suspend*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
@@ -172,7 +172,7 @@
{0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
PWR_INTF_SDIO_MSK, PWR_BASEADDR_SDIO,\
PWR_CMD_POLLING, BIT(1), BIT(1)},\
- /*0x04[12:11] = 2b'00enable WL suspend*/ \
+ /*0x04[12:11] = 2b'00 disable WL suspend*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, \
PWR_INTF_ALL_MSK, PWR_BASEADDR_MAC,\
PWR_CMD_WRITE, BIT(3)|BIT(4), 0},\
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
index 0fee5e0e55c2..3367cfbc9502 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
@@ -204,7 +204,7 @@
/*0x23[4] = 1b'0 12H LDO enter normal mode*/\
{0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, \
PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(4), 0}, \
- /*0x04[12:11] = 2b'01enable WL suspend*/\
+ /*0x04[12:11] = 2b'00 disable WL suspend*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,\
PWR_BASEADDR_MAC, PWR_CMD_WRITE, BIT(3)|BIT(4), 0},
@@ -251,7 +251,7 @@
/*0x48[16] = 0 to disable GPIO9 as EXT WAKEUP*/ \
{0x004A, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
Re: [PATCH] rtlwifi: fix REG_USTIME_TSF register definition
On Sun, Jun 11, 2017 at 11:18:38AM +0300, Kalle Valo wrote: > > Kevin Lo writes: > > > Sorry for the top post. This patch has an Acked-by Yan-Hsuan Chuang. > > > > On Wed, Jun 07, 2017 at 09:43:21AM +0800, 莊彥宣 wrote: > >> Yes, the register 0x55c is for REG_USTIME_TSF. > >> And 0x551 is for BCN_CTRL1. > >> > >> > >> Acked-by: Yan-Hsuan, Chuang > >> > >> 2017-05-19 23:02 GMT+08:00 Kevin Lo : > >> > >> > The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips > >> > should be 0x55C. > >> > > >> > Signed-off-by: Kevin Lo > > I don't see Yan-Hsuan's ack on the mailing list (maybe it was dropped > because of HTML?) and hence neither in patchwork: > > https://patchwork.kernel.org/patch/9737421/ Yan-Hsuan replied privately to me. I think he forgot to cc linux-wireless@. > Yan-Hsuan or Larry, can you please resend the ack so that patchwork sees > it? > > -- > Kalle Valo
Re: [PATCH] rtlwifi: fix REG_USTIME_TSF register definition
Sorry for the top post. This patch has an Acked-by Yan-Hsuan Chuang. On Wed, Jun 07, 2017 at 09:43:21AM +0800, 莊彥宣 wrote: > Yes, the register 0x55c is for REG_USTIME_TSF. > And 0x551 is for BCN_CTRL1. > > > Acked-by: Yan-Hsuan, Chuang > > 2017-05-19 23:02 GMT+08:00 Kevin Lo : > > > The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips > > should be 0x55C. > > > > Signed-off-by: Kevin Lo > > --- > > > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > > index 15400ee6c04b..0c0d64aea651 100644 > > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > > @@ -248,7 +248,6 @@ > > #define REG_RD_NAV_NXT 0x0544 > > #define REG_NAV_PROT_LEN 0x0546 > > #define REG_BCN_CTRL 0x0550 > > -#define REG_USTIME_TSF 0x0551 > > #define REG_MBID_NUM 0x0552 > > #define REG_DUAL_TSF_RST 0x0553 > > #define REG_BCN_INTERVAL 0x0554 > > @@ -256,6 +255,7 @@ > > #define REG_DRVERLYINT 0x0558 > > #define REG_BCNDMATIM 0x0559 > > #define REG_ATIMWND0x055A > > +#define REG_USTIME_TSF 0x055C > > #define REG_BCN_MAX_ERR0x055D > > #define REG_RXTSF_OFFSET_CCK 0x055E > > #define REG_RXTSF_OFFSET_OFDM 0x055F > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h > > b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h > > index 1bb7ed35812d..9e3b58a5d2bb 100644 > > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h > > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h > > @@ -227,7 +227,6 @@ > > #define REG_RD_NAV_NXT 0x0544 > > #define REG_NAV_PROT_LEN 0x0546 > > #define REG_BCN_CTRL 0x0550 > > -#define REG_USTIME_TSF 0x0551 > > #define REG_MBID_NUM 0x0552 > > #define REG_DUAL_TSF_RST 0x0553 > > #define REG_BCN_INTERVAL 0x0554 > > @@ -235,6 +234,7 @@ > > #define REG_DRVERLYINT 0x0558 > > #define REG_BCNDMATIM 0x0559 > > #define REG_ATIMWND0x055A > > +#define REG_USTIME_TSF 0x055C > > #define REG_BCN_MAX_ERR0x055D > > #define REG_RXTSF_OFFSET_CCK 0x055E > > #define REG_RXTSF_OFFSET_OFDM 0x055F > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h > > b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h > > index b354b95936e2..d4c4e76a9244 100644 > > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h > > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h > > @@ -255,7 +255,6 @@ > > #define REG_RD_NAV_NXT 0x0544 > > #define REG_NAV_PROT_LEN 0x0546 > > #define REG_BCN_CTRL 0x0550 > > -#define REG_USTIME_TSF 0x0551 > > #define REG_MBID_NUM 0x0552 > > #define REG_DUAL_TSF_RST 0x0553 > > #define REG_BCN_INTERVAL 0x0554 > > @@ -263,6 +262,7 @@ > > #define REG_DRVERLYINT 0x0558 > > #define REG_BCNDMATIM 0x0559 > > #define REG_ATIMWND0x055A > > +#define REG_USTIME_TSF 0x055C > > #define REG_BCN_MAX_ERR0x055D > > #define REG_RXTSF_OFFSET_CCK 0x055E > > #define REG_RXTSF_OFFSET_OFDM 0x055F > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h > > b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h > > index 306059f9b9cc..30938cd9fce5 100644 > > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h > > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h > > @@ -217,7 +217,6 @@ > > #define REG_RD_NAV_NXT 0x0544 > > #define REG_NAV_PROT_LEN 0x0546 > > #define REG_BCN_CTRL 0x0550 > > -#define REG_USTIME_TSF 0x0551 > > #define REG_MBID_NUM 0x0552 > > #
[PATCH] rtlwifi: fix REG_USTIME_TSF register definition
The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips should be 0x55C. Signed-off-by: Kevin Lo --- diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h index 15400ee6c04b..0c0d64aea651 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h @@ -248,7 +248,6 @@ #define REG_RD_NAV_NXT 0x0544 #define REG_NAV_PROT_LEN 0x0546 #define REG_BCN_CTRL 0x0550 -#define REG_USTIME_TSF 0x0551 #define REG_MBID_NUM 0x0552 #define REG_DUAL_TSF_RST 0x0553 #define REG_BCN_INTERVAL 0x0554 @@ -256,6 +255,7 @@ #define REG_DRVERLYINT 0x0558 #define REG_BCNDMATIM 0x0559 #define REG_ATIMWND0x055A +#define REG_USTIME_TSF 0x055C #define REG_BCN_MAX_ERR0x055D #define REG_RXTSF_OFFSET_CCK 0x055E #define REG_RXTSF_OFFSET_OFDM 0x055F diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h index 1bb7ed35812d..9e3b58a5d2bb 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h @@ -227,7 +227,6 @@ #define REG_RD_NAV_NXT 0x0544 #define REG_NAV_PROT_LEN 0x0546 #define REG_BCN_CTRL 0x0550 -#define REG_USTIME_TSF 0x0551 #define REG_MBID_NUM 0x0552 #define REG_DUAL_TSF_RST 0x0553 #define REG_BCN_INTERVAL 0x0554 @@ -235,6 +234,7 @@ #define REG_DRVERLYINT 0x0558 #define REG_BCNDMATIM 0x0559 #define REG_ATIMWND0x055A +#define REG_USTIME_TSF 0x055C #define REG_BCN_MAX_ERR0x055D #define REG_RXTSF_OFFSET_CCK 0x055E #define REG_RXTSF_OFFSET_OFDM 0x055F diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h index b354b95936e2..d4c4e76a9244 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h @@ -255,7 +255,6 @@ #define REG_RD_NAV_NXT 0x0544 #define REG_NAV_PROT_LEN 0x0546 #define REG_BCN_CTRL 0x0550 -#define REG_USTIME_TSF 0x0551 #define REG_MBID_NUM 0x0552 #define REG_DUAL_TSF_RST 0x0553 #define REG_BCN_INTERVAL 0x0554 @@ -263,6 +262,7 @@ #define REG_DRVERLYINT 0x0558 #define REG_BCNDMATIM 0x0559 #define REG_ATIMWND0x055A +#define REG_USTIME_TSF 0x055C #define REG_BCN_MAX_ERR0x055D #define REG_RXTSF_OFFSET_CCK 0x055E #define REG_RXTSF_OFFSET_OFDM 0x055F diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h index 306059f9b9cc..30938cd9fce5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h @@ -217,7 +217,6 @@ #define REG_RD_NAV_NXT 0x0544 #define REG_NAV_PROT_LEN 0x0546 #define REG_BCN_CTRL 0x0550 -#define REG_USTIME_TSF 0x0551 #define REG_MBID_NUM 0x0552 #define REG_DUAL_TSF_RST 0x0553 #define REG_BCN_INTERVAL 0x0554 @@ -225,6 +224,7 @@ #define REG_DRVERLYINT 0x0558 #define REG_BCNDMATIM 0x0559 #define REG_ATIMWND0x055A +#define REG_USTIME_TSF 0x055C #define REG_BCN_MAX_ERR0x055D #define REG_RXTSF_OFFSET_CCK 0x055E #define REG_RXTSF_OFFSET_OFDM 0x055F diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h index 03581d2a5da0..95c4f8e206c7 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h @@ -261,7 +261,6 @@ #define REG_RD_NAV_NXT 0x0544 #define REG_NAV_PROT_LEN 0x0546 #define REG_BCN_CTRL 0x0550 -#define REG_USTIME_TSF 0x0551 #define REG_MBID_NUM 0x0552 #define REG_DUAL_TSF_RST
