Commit fd9e3171 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

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: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6dee0c88

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static void rtl819x_ifsilentreset(struct net_device *dev) 
		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;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8192e/rtl8192e/rtl_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -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);