staging: rtl8188eu: using unique names is good

fixes:

drivers/staging/built-in.o:(.opd+0xaab8): multiple definition of `rtl88e_phy_rf_config'
drivers/net/built-in.o:(.opd+0x78840): first defined here
drivers/staging/built-in.o:(.opd+0xa9f8): multiple definition of `rtl88e_download_fw'
drivers/net/built-in.o:(.opd+0x781b0): first defined here
drivers/staging/built-in.o: In function `.rtl88e_phy_rf_config':
(.text+0xe0a00): multiple definition of `.rtl88e_phy_rf_config'
drivers/net/built-in.o:(.text+0xe85a48): first defined here
drivers/staging/built-in.o: In function `.rtl88e_download_fw':
(.text+0xdf28c): multiple definition of `.rtl88e_download_fw'
drivers/net/built-in.o:(.text+0xe6f330): first defined here
drivers/staging/built-in.o: In function `.rtl88e_phy_mac_config':
(.text+0xdf984): multiple definition of `.rtl88e_phy_mac_config'
drivers/net/built-in.o:(.text+0xe84a8c): first defined here
drivers/staging/built-in.o: In function `.rtl88e_phy_bb_config':
(.text+0xdfa2c): multiple definition of `.rtl88e_phy_bb_config'
drivers/net/built-in.o:(.text+0xe84d14): first defined here
drivers/staging/built-in.o:(.opd+0xaa58): multiple definition of `rtl88e_phy_bb_config'
drivers/net/built-in.o:(.opd+0x78828): first defined here
drivers/staging/built-in.o:(.opd+0xaa28): multiple definition of `rtl88e_phy_mac_config'

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c
index 00f9cd7371935d0cb33b0af0687c80d49dc65ca6..0c5dc26fd5a29df361f76616b8e64f0136f213a3 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c
@@ -687,7 +687,7 @@ static bool config_parafile(struct adapter *adapt)
        return true;
 }
 
-bool rtl88e_phy_bb_config(struct adapter *adapt)
+bool rtl88eu_phy_bb_config(struct adapter *adapt)
 {
        int rtstatus = true;
        struct hal_data_8188e   *hal_data = GET_HAL_DATA(adapt);

diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c
index 28bb27553b846dda5f4e0849d2a64bf07410ef53..c0e7fa938059757d62dd72da9bbe01575f73f1c7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c
@@ -117,7 +117,7 @@ static u32 array_MAC_REG_8188E[] = {
                0x70B, 0x00000087,
 };
 
-bool rtl88e_phy_mac_config(struct adapter *adapt)
+bool rtl88eu_phy_mac_config(struct adapter *adapt)
 {
        u32 i;
        u32 arraylength;

diff --git a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
index 2648840f9e20887a1e81af29013429953fdbbd73..94ee740efd1fe129f6156429a92ab0f1dc0f7972 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
@@ -312,7 +312,7 @@ static bool rtl88e_phy_rf6052_config(struct adapter *adapt)
        return rf6052_conf_para(adapt);
 }
 
-bool rtl88e_phy_rf_config(struct adapter *adapt)
+bool rtl88eu_phy_rf_config(struct adapter *adapt)
 {
        return rtl88e_phy_rf6052_config(adapt);
 }

diff --git a/drivers/staging/rtl8188eu/hal/fw.c b/drivers/staging/rtl8188eu/hal/fw.c
index 09324ae80e728ef7bcdc1abe12ba20d2095b0ff6..17b7f37505470a95097f79206a12728c2dec4ddd 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/fw.c
+++ b/drivers/staging/rtl8188eu/hal/fw.c
@@ -181,7 +181,7 @@ exit:
        return err;
 }
 
-int rtl88e_download_fw(struct adapter *adapt)
+int rtl88eu_download_fw(struct adapter *adapt)
 {
        struct hal_data_8188e *rtlhal = GET_HAL_DATA(adapt);
        struct dvobj_priv *dvobj = adapter_to_dvobj(adapt);

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index c5559dfa4e92d1ea35b894cee475e6d8cb9f9cd4..1f057b32876da87eee932a1edb689e4416b77bd7 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -743,7 +743,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
                Adapter->bFWReady = false;
                haldata->fw_ractrl = false;
        } else {
-               status = rtl88e_download_fw(Adapter);
+               status = rtl88eu_download_fw(Adapter);
 
                if (status) {
                        DBG_88E("%s: Download Firmware failed!!\n", __func__);
@@ -758,11 +758,11 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
        }
        rtl8188e_InitializeFirmwareVars(Adapter);
 
-       rtl88e_phy_mac_config(Adapter);
+       rtl88eu_phy_mac_config(Adapter);
 
-       rtl88e_phy_bb_config(Adapter);
+       rtl88eu_phy_bb_config(Adapter);
 
-       rtl88e_phy_rf_config(Adapter);
+       rtl88eu_phy_rf_config(Adapter);
 
        HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
        status = rtl8188e_iol_efuse_patch(Adapter);

diff --git a/drivers/staging/rtl8188eu/include/fw.h b/drivers/staging/rtl8188eu/include/fw.h
index c7c7e7e5ffacf82778ece466b655f89b464a4bc9..d5faaff3db5972a78f9f73f2ae7bf59c97258935 100644 (file)
--- a/drivers/staging/rtl8188eu/include/fw.h
+++ b/drivers/staging/rtl8188eu/include/fw.h
@@ -54,6 +54,6 @@ struct rtl92c_firmware_header {
        u32 rsvd5;
 };
 
-int rtl88e_download_fw(struct adapter *adapt);
+int rtl88eu_download_fw(struct adapter *adapt);
 
 #endif

diff --git a/drivers/staging/rtl8188eu/include/phy.h b/drivers/staging/rtl8188eu/include/phy.h
index 676a66c4426469ce881cb19fedae1721dc442f35..e3efa8fd69a88ebd062940bd682875117dde9ce7 100644 (file)
--- a/drivers/staging/rtl8188eu/include/phy.h
+++ b/drivers/staging/rtl8188eu/include/phy.h
@@ -1,3 +1,3 @@
-bool rtl88e_phy_mac_config(struct adapter *adapt);
-bool rtl88e_phy_rf_config(struct adapter *adapt);
-bool rtl88e_phy_bb_config(struct adapter *adapt);
+bool rtl88eu_phy_mac_config(struct adapter *adapt);
+bool rtl88eu_phy_rf_config(struct adapter *adapt);
+bool rtl88eu_phy_bb_config(struct adapter *adapt);