You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
3.3 KiB
79 lines
3.3 KiB
From 533293085b6c331f20c36fa09fe3cf1e904ce259 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Wed, 24 Aug 2016 11:31:38 -0400
|
|
Subject: [PATCH] rtl8xxxu: Clean up llt_init() API
|
|
|
|
Remove last_tx_page argument from the llt_init() function. The
|
|
rtl8xxxu_fileops structure contains the correct TX_TOTAL_PAGE_NUM
|
|
value for the device, and rtl8xxxu_auto_llt_table() doesn't need to
|
|
know the value in the first place.
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 +++---
|
|
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 ++++++---
|
|
2 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
|
|
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
|
|
@@ -1367,7 +1367,7 @@ struct rtl8xxxu_fileops {
|
|
int (*power_on) (struct rtl8xxxu_priv *priv);
|
|
void (*power_off) (struct rtl8xxxu_priv *priv);
|
|
void (*reset_8051) (struct rtl8xxxu_priv *priv);
|
|
- int (*llt_init) (struct rtl8xxxu_priv *priv, u8 last_tx_page);
|
|
+ int (*llt_init) (struct rtl8xxxu_priv *priv);
|
|
void (*init_phy_bb) (struct rtl8xxxu_priv *priv);
|
|
int (*init_phy_rf) (struct rtl8xxxu_priv *priv);
|
|
void (*phy_init_antenna_selection) (struct rtl8xxxu_priv *priv);
|
|
@@ -1449,14 +1449,14 @@ int rtl8xxxu_load_firmware(struct rtl8xx
|
|
void rtl8xxxu_firmware_self_reset(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_reset_8051(struct rtl8xxxu_priv *priv);
|
|
-int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page);
|
|
+int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen2_prepare_calibrate(struct rtl8xxxu_priv *priv, u8 start);
|
|
int rtl8xxxu_flush_fifo(struct rtl8xxxu_priv *priv);
|
|
int rtl8xxxu_gen2_h2c_cmd(struct rtl8xxxu_priv *priv,
|
|
struct h2c_cmd *h2c, int len);
|
|
int rtl8xxxu_active_to_lps(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_disabled_to_emu(struct rtl8xxxu_priv *priv);
|
|
-int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page);
|
|
+int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen1_phy_iq_calibrate(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen1_init_phy_bb(struct rtl8xxxu_priv *priv);
|
|
void rtl8xxxu_gen1_set_tx_power(struct rtl8xxxu_priv *priv,
|
|
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
|
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
|
@@ -2482,10 +2482,13 @@ static int rtl8xxxu_llt_write(struct rtl
|
|
return ret;
|
|
}
|
|
|
|
-int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page)
|
|
+int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv)
|
|
{
|
|
int ret;
|
|
int i;
|
|
+ u8 last_tx_page;
|
|
+
|
|
+ last_tx_page = priv->fops->total_page_num;
|
|
|
|
for (i = 0; i < last_tx_page; i++) {
|
|
ret = rtl8xxxu_llt_write(priv, i, i + 1);
|
|
@@ -2513,7 +2516,7 @@ exit:
|
|
return ret;
|
|
}
|
|
|
|
-int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page)
|
|
+int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv)
|
|
{
|
|
u32 val32;
|
|
int ret = 0;
|
|
@@ -3999,7 +4002,7 @@ static int rtl8xxxu_init_device(struct i
|
|
|
|
dev_dbg(dev, "%s: macpower %i\n", __func__, macpower);
|
|
if (!macpower) {
|
|
- ret = priv->fops->llt_init(priv, TX_TOTAL_PAGE_NUM);
|
|
+ ret = priv->fops->llt_init(priv);
|
|
if (ret) {
|
|
dev_warn(dev, "%s: LLT table init failed\n", __func__);
|
|
goto exit;
|
|
|