diff options
Diffstat (limited to 'package/kernel/mac80211/patches/652-0049-rtl8xxxu-Use-a-struct-rtl8xxxu_fileops-in-rtl8xxxu_i.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/652-0049-rtl8xxxu-Use-a-struct-rtl8xxxu_fileops-in-rtl8xxxu_i.patch | 158 |
1 files changed, 158 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/652-0049-rtl8xxxu-Use-a-struct-rtl8xxxu_fileops-in-rtl8xxxu_i.patch b/package/kernel/mac80211/patches/652-0049-rtl8xxxu-Use-a-struct-rtl8xxxu_fileops-in-rtl8xxxu_i.patch new file mode 100644 index 0000000000..5e46c29adb --- /dev/null +++ b/package/kernel/mac80211/patches/652-0049-rtl8xxxu-Use-a-struct-rtl8xxxu_fileops-in-rtl8xxxu_i.patch @@ -0,0 +1,158 @@ +From e3c6694ed9367142704930754f3d6bff6c25f7e7 Mon Sep 17 00:00:00 2001 +From: Jes Sorensen <Jes.Sorensen@redhat.com> +Date: Wed, 24 Aug 2016 14:06:04 -0400 +Subject: [PATCH] rtl8xxxu: Use a struct rtl8xxxu_fileops * in + rtl8xxxu_init_device() + +This saves some 217, or about, derefences of priv->fops. + +Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> +--- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 39 +++++++++++----------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c ++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +@@ -3896,6 +3896,7 @@ static int rtl8xxxu_init_device(struct i + { + struct rtl8xxxu_priv *priv = hw->priv; + struct device *dev = &priv->udev->dev; ++ struct rtl8xxxu_fileops *fops = priv->fops; + bool macpower; + int ret; + u8 val8; +@@ -3914,7 +3915,7 @@ static int rtl8xxxu_init_device(struct i + else + macpower = true; + +- ret = priv->fops->power_on(priv); ++ ret = fops->power_on(priv); + if (ret < 0) { + dev_warn(dev, "%s: Failed power on\n", __func__); + goto exit; +@@ -3931,7 +3932,7 @@ static int rtl8xxxu_init_device(struct i + /* + * Set RX page boundary + */ +- rtl8xxxu_write16(priv, REG_TRXFF_BNDY + 2, priv->fops->trxff_boundary); ++ rtl8xxxu_write16(priv, REG_TRXFF_BNDY + 2, fops->trxff_boundary); + + ret = rtl8xxxu_download_firmware(priv); + dev_dbg(dev, "%s: download_firmware %i\n", __func__, ret); +@@ -3942,8 +3943,8 @@ static int rtl8xxxu_init_device(struct i + if (ret) + goto exit; + +- if (priv->fops->phy_init_antenna_selection) +- priv->fops->phy_init_antenna_selection(priv); ++ if (fops->phy_init_antenna_selection) ++ fops->phy_init_antenna_selection(priv); + + ret = rtl8xxxu_init_mac(priv); + +@@ -3956,7 +3957,7 @@ static int rtl8xxxu_init_device(struct i + if (ret) + goto exit; + +- ret = priv->fops->init_phy_rf(priv); ++ ret = fops->init_phy_rf(priv); + if (ret) + goto exit; + +@@ -3982,7 +3983,7 @@ static int rtl8xxxu_init_device(struct i + /* + * Set TX buffer boundary + */ +- val8 = priv->fops->total_page_num + 1; ++ val8 = fops->total_page_num + 1; + + rtl8xxxu_write8(priv, REG_TXPKTBUF_BCNQ_BDNY, val8); + rtl8xxxu_write8(priv, REG_TXPKTBUF_MGQ_BDNY, val8); +@@ -3995,14 +3996,14 @@ static int rtl8xxxu_init_device(struct i + * The vendor drivers set PBP for all devices, except 8192e. + * There is no explanation for this in any of the sources. + */ +- val8 = (priv->fops->pbp_rx << PBP_PAGE_SIZE_RX_SHIFT) | +- (priv->fops->pbp_tx << PBP_PAGE_SIZE_TX_SHIFT); ++ val8 = (fops->pbp_rx << PBP_PAGE_SIZE_RX_SHIFT) | ++ (fops->pbp_tx << PBP_PAGE_SIZE_TX_SHIFT); + if (priv->rtl_chip != RTL8192E) + rtl8xxxu_write8(priv, REG_PBP, val8); + + dev_dbg(dev, "%s: macpower %i\n", __func__, macpower); + if (!macpower) { +- ret = priv->fops->llt_init(priv); ++ ret = fops->llt_init(priv); + if (ret) { + dev_warn(dev, "%s: LLT table init failed\n", __func__); + goto exit; +@@ -4011,12 +4012,12 @@ static int rtl8xxxu_init_device(struct i + /* + * Chip specific quirks + */ +- priv->fops->usb_quirks(priv); ++ fops->usb_quirks(priv); + + /* + * Enable TX report and TX report timer for 8723bu/8188eu/... + */ +- if (priv->fops->has_tx_report) { ++ if (fops->has_tx_report) { + val8 = rtl8xxxu_read8(priv, REG_TX_REPORT_CTRL); + val8 |= TX_REPORT_CTRL_TIMER_ENABLE; + rtl8xxxu_write8(priv, REG_TX_REPORT_CTRL, val8); +@@ -4108,7 +4109,7 @@ static int rtl8xxxu_init_device(struct i + * Set data auto rate fallback retry count. + * Notably the 8188eu doesn't seem to use this + */ +- if (priv->fops->has_darfrc) { ++ if (fops->has_darfrc) { + rtl8xxxu_write32(priv, REG_DARFRC, 0x00000000); + rtl8xxxu_write32(priv, REG_DARFRC + 4, 0x10080404); + rtl8xxxu_write32(priv, REG_RARFRC, 0x04030201); +@@ -4165,8 +4166,8 @@ static int rtl8xxxu_init_device(struct i + rtl8xxxu_write8(priv, REG_RSV_CTRL, val8); + } + +- if (priv->fops->init_aggregation) +- priv->fops->init_aggregation(priv); ++ if (fops->init_aggregation) ++ fops->init_aggregation(priv); + + /* + * Enable CCK and OFDM block +@@ -4183,7 +4184,7 @@ static int rtl8xxxu_init_device(struct i + /* + * Start out with default power levels for channel 6, 20MHz + */ +- priv->fops->set_tx_power(priv, 1, false); ++ fops->set_tx_power(priv, 1, false); + + /* Let the 8051 take control of antenna setting */ + if (priv->rtl_chip != RTL8192E) { +@@ -4199,8 +4200,8 @@ static int rtl8xxxu_init_device(struct i + + rtl8xxxu_write16(priv, REG_FAST_EDCA_CTRL, 0); + +- if (priv->fops->init_statistics) +- priv->fops->init_statistics(priv); ++ if (fops->init_statistics) ++ fops->init_statistics(priv); + + if (priv->rtl_chip == RTL8192E) { + /* +@@ -4225,12 +4226,12 @@ static int rtl8xxxu_init_device(struct i + + rtl8723a_phy_lc_calibrate(priv); + +- priv->fops->phy_iq_calibrate(priv); ++ fops->phy_iq_calibrate(priv); + + /* + * This should enable thermal meter + */ +- if (priv->fops->gen2_thermal_meter) ++ if (fops->gen2_thermal_meter) + rtl8xxxu_write_rfreg(priv, + RF_A, RF6052_REG_T_METER_8723B, 0x37cf8); + else |