From b7dda34d1ecda7e3243137a6ffcb7e9173e5d651 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 29 Feb 2016 17:04:27 -0500 Subject: [PATCH] rtl8xxxu: rtl8192eu_parse_efuse(): Use a pointer to the struct rtl8192eu_efuse Make the code easier to read and less error prone by using a pointer to the efuse. Signed-off-by: Jes Sorensen Signed-off-by: Kalle Valo --- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c index fcae9f020f5c8..a8f1eae60815d 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c @@ -2288,33 +2288,27 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv) static int rtl8192eu_parse_efuse(struct rtl8xxxu_priv *priv) { + struct rtl8192eu_efuse *efuse = &priv->efuse_wifi.efuse8192eu; int i; - if (priv->efuse_wifi.efuse8192eu.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.efuse8192eu.mac_addr); + ether_addr_copy(priv->mac_addr, efuse->mac_addr); - memcpy(priv->cck_tx_power_index_A, - priv->efuse_wifi.efuse8192eu.cck_tx_power_index_A, + memcpy(priv->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.efuse8192eu.cck_tx_power_index_B, + memcpy(priv->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.efuse8192eu.ht40_1s_tx_power_index_A, + memcpy(priv->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.efuse8192eu.ht40_1s_tx_power_index_B, + memcpy(priv->ht40_1s_tx_power_index_B, efuse->ht40_1s_tx_power_index_B, sizeof(priv->ht40_1s_tx_power_index_B)); - dev_info(&priv->udev->dev, "Vendor: %.7s\n", - priv->efuse_wifi.efuse8192eu.vendor_name); - dev_info(&priv->udev->dev, "Product: %.11s\n", - priv->efuse_wifi.efuse8192eu.device_name); - dev_info(&priv->udev->dev, "Serial: %.11s\n", - priv->efuse_wifi.efuse8192eu.serial); + dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name); + dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name); + dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial); if (rtl8xxxu_debug & RTL8XXXU_DEBUG_EFUSE) { unsigned char *raw = priv->efuse_wifi.raw;