staging: r8188eu: Eliminate enum ODM_RADIO_PATH in favor of rf_radio_path

There are two different enum statements that have been combined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
index 480c810..17c6411 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
@@ -211,7 +211,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
                                else if (v1 == 0xf9)
                                        rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
                                else
-                                       rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
+                                       rtw_IOL_append_WRF_cmd(pxmit_frame, RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
                        } else {
                                odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
                        }
@@ -247,7 +247,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
                                                else if (v1 == 0xf9)
                                                        rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
                                                else
-                                                       rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
+                                                       rtw_IOL_append_WRF_cmd(pxmit_frame, RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);
                                        } else {
                                                odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
                                        }

diff --cc drivers/staging/rtl8188eu/hal/odm_HWConfig.c
Simple merge

diff --cc drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c
Simple merge

diff --cc drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c
Simple merge

diff --cc drivers/staging/rtl8188eu/include/odm.h
Simple merge

diff --cc drivers/staging/rtl8188eu/include/odm_HWConfig.h
Simple merge

diff --cc drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h
Simple merge