staging: rtl8192e: Rename deinit_hal_dm

Use naming schema found in other rtlwifi devices.
Rename deinit_hal_dm to rtl92e_dm_deinit.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 85def08be69a306ec32db773f2553440094826c4..8091f79337dadd04a2f5eb50dca2ad914ea38c44 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1304,7 +1304,7 @@ RESET_START:
                rtl92e_irq_disable(dev);
                del_timer_sync(&priv->watch_dog_timer);
                rtl8192_cancel_deferred_work(priv);
-               deinit_hal_dm(dev);
+               rtl92e_dm_deinit(dev);
                rtllib_stop_scan_syncro(ieee);
 
                if (ieee->state == RTLLIB_LINKED) {
@@ -2736,7 +2736,7 @@ static void rtl8192_pci_disconnect(struct pci_dev *pdev)
                cancel_delayed_work(&priv->gpio_change_rf_wq);
                priv->polling_timer_on = 0;
                rtl8192_down(dev, true);
-               deinit_hal_dm(dev);
+               rtl92e_dm_deinit(dev);
                if (priv->pFirmware) {
                        vfree(priv->pFirmware);
                        priv->pFirmware = NULL;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 342777d6764a897a80ac62c2d45fba196ed25c10..9d0b633dd7cd04fdc1a0c2e3f6eeb99450d3f457 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -249,7 +249,7 @@ void init_hal_dm(struct net_device *dev)
                              (void *)dm_CheckRfCtrlGPIO, dev);
 }
 
-void deinit_hal_dm(struct net_device *dev)
+void rtl92e_dm_deinit(struct net_device *dev)
 {
 
        dm_deInit_fsync(dev);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index 95b8a8fd0556b4755885bca21b5fcded1a916953..647a569d7787fb3274a8112d07c7b36a83a9afd2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -189,7 +189,7 @@ extern const u8 dm_cck_tx_bb_gain_ch14[CCKTxBBGainTableLength][8];
 /*--------------------------Exported Function prototype---------------------*/
 
 extern  void    init_hal_dm(struct net_device *dev);
-extern  void deinit_hal_dm(struct net_device *dev);
+extern  void rtl92e_dm_deinit(struct net_device *dev);
 
 extern void hal_dm_watchdog(struct net_device *dev);