staging: r8188eu: remove macro GET_EEPROM_EFUSE_PRIV

Replace and remove the macro GET_EEPROM_EFUSE_PRIV to get one step
closer to remove hal_intf.h.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210912100836.4655-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_efuse.c b/drivers/staging/r8188eu/core/rtw_efuse.c
index 47c4d8b..0c4ea1e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_efuse.c
+++ b/drivers/staging/r8188eu/core/rtw_efuse.c
@@ -598,7 +598,7 @@ efuse_ShadowRead1Byte(
                u16 Offset,
                u8 *Value)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
+       struct eeprom_priv *pEEPROM = &pAdapter->eeprompriv;
 
        *Value = pEEPROM->efuse_eeprom_data[Offset];
 
@@ -611,7 +611,7 @@ efuse_ShadowRead2Byte(
                u16 Offset,
                u16 *Value)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
+       struct eeprom_priv *pEEPROM = &pAdapter->eeprompriv;
 
        *Value = pEEPROM->efuse_eeprom_data[Offset];
        *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8;
@@ -625,7 +625,7 @@ efuse_ShadowRead4Byte(
                u16 Offset,
                u32 *Value)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
+       struct eeprom_priv *pEEPROM = &pAdapter->eeprompriv;
 
        *Value = pEEPROM->efuse_eeprom_data[Offset];
        *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8;
@@ -684,7 +684,7 @@ void EFUSE_ShadowMapUpdate(
        u8 efuseType,
        bool pseudo)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
+       struct eeprom_priv *pEEPROM = &pAdapter->eeprompriv;
        u16 mapLen = 0;
 
        rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index d164816..c118811 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1834,7 +1834,7 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)
 void
 Hal_InitPGData88E(struct adapter *padapter)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
+       struct eeprom_priv *pEEPROM = &padapter->eeprompriv;
 
        if (!pEEPROM->bautoload_fail_flag) { /*  autoload OK. */
                if (!is_boot_from_eeprom(padapter)) {
@@ -1854,7 +1854,7 @@ Hal_EfuseParseIDCode88E(
                u8 *hwinfo
        )
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
+       struct eeprom_priv *pEEPROM = &padapter->eeprompriv;
        u16                     EEPROMId;
 
        /*  Check 0x8129 again for making sure autoload status!! */

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
index 94febe0..521ecdb 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c
@@ -532,7 +532,7 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa
 
 static int phy_BB8188E_Config_ParaFile(struct adapter *Adapter)
 {
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
+       struct eeprom_priv *pEEPROM = &Adapter->eeprompriv;
        struct hal_data_8188e           *pHalData = GET_HAL_DATA(Adapter);
        int                     rtStatus = _SUCCESS;
 

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 3af609f..dfaa019 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1110,7 +1110,7 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool
 {
        u16 i;
        u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02};
-       struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(adapt);
+       struct eeprom_priv *eeprom = &adapt->eeprompriv;
 
        if (AutoLoadFail) {
                for (i = 0; i < 6; i++)
@@ -1126,7 +1126,7 @@ readAdapterInfo_8188EU(
                struct adapter *adapt
        )
 {
-       struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(adapt);
+       struct eeprom_priv *eeprom = &adapt->eeprompriv;
 
        /* parse the eeprom/efuse content */
        Hal_EfuseParseIDCode88E(adapt, eeprom->efuse_eeprom_data);
@@ -1150,7 +1150,7 @@ static void _ReadPROMContent(
        struct adapter *Adapter
        )
 {
-       struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(Adapter);
+       struct eeprom_priv *eeprom = &Adapter->eeprompriv;
        u8 eeValue;
 
        /* check system boot selection */

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 49c34d5..cc8db98 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -155,8 +155,6 @@ struct hal_ops {
 
 #define HARDWARE_TYPE_RTL8188EU 17
 
-#define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv)
-
 #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)
 
 void rtl8188eu_set_hal_ops(struct adapter *padapter);

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index 92b8f2c..ac218da 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -4501,7 +4501,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
                        union iwreq_data *wdata, char *extra)
 {
        struct adapter *padapter = rtw_netdev_priv(dev);
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
+       struct eeprom_priv *pEEPROM = &padapter->eeprompriv;
        struct hal_data_8188e *haldata = GET_HAL_DATA(padapter);
        struct efuse_hal *pEfuseHal;
        struct iw_point *wrqu;
@@ -6138,7 +6138,7 @@ static int rtw_mp_QueryDrv(struct net_device *dev,
        struct adapter *padapter = rtw_netdev_priv(dev);
        char    *input = kmalloc(wrqu->data.length, GFP_KERNEL);
        u8 qAutoLoad = 1;
-       struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
+       struct eeprom_priv *pEEPROM = &padapter->eeprompriv;
 
        if (!input)
                return -ENOMEM;