rtl8xxxu: rtl8192cu: Introduce a pointer to efuse

Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 172d76c0dcb58cbf7c3b230399885f81e37ff4fa..fcae9f020f5c821c9fc29cb74614e822ae511892 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -2218,50 +2218,51 @@ static int rtl8723bu_parse_efuse(struct rtl8xxxu_priv *priv)
 
 static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv)
 {
+       struct rtl8192cu_efuse *efuse = &priv->efuse_wifi.efuse8192;
        int i;
 
-       if (priv->efuse_wifi.efuse8192.rtl_id != cpu_to_le16(0x8129))
+       if (efuse->rtl_id != cpu_to_le16(0x8129))
                return -EINVAL;
 
-       ether_addr_copy(priv->mac_addr, priv->efuse_wifi.efuse8192.mac_addr);
+       ether_addr_copy(priv->mac_addr, efuse->mac_addr);
 
        memcpy(priv->cck_tx_power_index_A,
-              priv->efuse_wifi.efuse8192.cck_tx_power_index_A,
+              efuse->cck_tx_power_index_A,
               sizeof(priv->cck_tx_power_index_A));
        memcpy(priv->cck_tx_power_index_B,
-              priv->efuse_wifi.efuse8192.cck_tx_power_index_B,
+              efuse->cck_tx_power_index_B,
               sizeof(priv->cck_tx_power_index_B));
 
        memcpy(priv->ht40_1s_tx_power_index_A,
-              priv->efuse_wifi.efuse8192.ht40_1s_tx_power_index_A,
+              efuse->ht40_1s_tx_power_index_A,
               sizeof(priv->ht40_1s_tx_power_index_A));
        memcpy(priv->ht40_1s_tx_power_index_B,
-              priv->efuse_wifi.efuse8192.ht40_1s_tx_power_index_B,
+              efuse->ht40_1s_tx_power_index_B,
               sizeof(priv->ht40_1s_tx_power_index_B));
        memcpy(priv->ht40_2s_tx_power_index_diff,
-              priv->efuse_wifi.efuse8192.ht40_2s_tx_power_index_diff,
+              efuse->ht40_2s_tx_power_index_diff,
               sizeof(priv->ht40_2s_tx_power_index_diff));
 
        memcpy(priv->ht20_tx_power_index_diff,
-              priv->efuse_wifi.efuse8192.ht20_tx_power_index_diff,
+              efuse->ht20_tx_power_index_diff,
               sizeof(priv->ht20_tx_power_index_diff));
        memcpy(priv->ofdm_tx_power_index_diff,
-              priv->efuse_wifi.efuse8192.ofdm_tx_power_index_diff,
+              efuse->ofdm_tx_power_index_diff,
               sizeof(priv->ofdm_tx_power_index_diff));
 
        memcpy(priv->ht40_max_power_offset,
-              priv->efuse_wifi.efuse8192.ht40_max_power_offset,
+              efuse->ht40_max_power_offset,
               sizeof(priv->ht40_max_power_offset));
        memcpy(priv->ht20_max_power_offset,
-              priv->efuse_wifi.efuse8192.ht20_max_power_offset,
+              efuse->ht20_max_power_offset,
               sizeof(priv->ht20_max_power_offset));
 
        dev_info(&priv->udev->dev, "Vendor: %.7s\n",
-                priv->efuse_wifi.efuse8192.vendor_name);
+                efuse->vendor_name);
        dev_info(&priv->udev->dev, "Product: %.20s\n",
-                priv->efuse_wifi.efuse8192.device_name);
+                efuse->device_name);
 
-       if (priv->efuse_wifi.efuse8192.rf_regulatory & 0x20) {
+       if (efuse->rf_regulatory & 0x20) {
                sprintf(priv->chip_name, "8188RU");
                priv->hi_pa = 1;
        }