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

staging: rtl8192e: Rename rtl8192_irq_disable 



Use naming schema found in other rtlwifi devices.
Rename rtl8192_irq_disable to rtl92e_irq_disable.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 122fe9f1

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ void rtl92e_start_beacon(struct net_device *dev) 
	u16 BcnCW = 6;

	u16 BcnCW = 6;

	u16 BcnIFS = 0xf;

	u16 BcnIFS = 0xf;





	rtl8192_irq_disable(dev);

	rtl92e_irq_disable(dev);





	write_nic_word(dev, ATIMWND, 2);

	write_nic_word(dev, ATIMWND, 2);

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ void rtl8192_irq_enable(struct net_device *dev) 
	priv->ops->irq_enable(dev);

	priv->ops->irq_enable(dev);

}

}





void rtl8192_irq_disable(struct net_device *dev)

void rtl92e_irq_disable(struct net_device *dev)

{

{

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
@@ -826,7 +826,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf) 
	priv->rtllib->wpa_ie = NULL;

	priv->rtllib->wpa_ie = NULL;

	rtl92e_cam_reset(dev);

	rtl92e_cam_reset(dev);

	memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);

	memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);

	rtl8192_irq_disable(dev);

	rtl92e_irq_disable(dev);





	del_timer_sync(&priv->watch_dog_timer);

	del_timer_sync(&priv->watch_dog_timer);

	rtl8192_cancel_deferred_work(priv);

	rtl8192_cancel_deferred_work(priv);
@@ -1102,7 +1102,7 @@ static short rtl8192_init(struct net_device *dev) 
		    rtl92e_check_rfctrl_gpio_timer,

		    rtl92e_check_rfctrl_gpio_timer,

		    (unsigned long)dev);

		    (unsigned long)dev);





	rtl8192_irq_disable(dev);

	rtl92e_irq_disable(dev);

	if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,

	if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,

	    dev->name, dev)) {

	    dev->name, dev)) {

		netdev_err(dev, "Error allocating IRQ %d", dev->irq);

		netdev_err(dev, "Error allocating IRQ %d", dev->irq);
@@ -1301,7 +1301,7 @@ static void rtl819x_ifsilentreset(struct net_device *dev) 
		if (!netif_queue_stopped(dev))

		if (!netif_queue_stopped(dev))

			netif_stop_queue(dev);

			netif_stop_queue(dev);





		rtl8192_irq_disable(dev);

		rtl92e_irq_disable(dev);

		del_timer_sync(&priv->watch_dog_timer);

		del_timer_sync(&priv->watch_dog_timer);

		rtl8192_cancel_deferred_work(priv);

		rtl8192_cancel_deferred_work(priv);

		deinit_hal_dm(dev);

		deinit_hal_dm(dev);
@@ -2283,7 +2283,7 @@ void rtl92e_commit(struct net_device *dev) 
	if (priv->up == 0)

	if (priv->up == 0)

		return;

		return;

	rtllib_softmac_stop_protocol(priv->rtllib, 0, true);

	rtllib_softmac_stop_protocol(priv->rtllib, 0, true);

	rtl8192_irq_disable(dev);

	rtl92e_irq_disable(dev);

	priv->ops->stop_adapter(dev, true);

	priv->ops->stop_adapter(dev, true);

	_rtl8192_up(dev, false);

	_rtl8192_up(dev, false);

}

}
@@ -2816,7 +2816,7 @@ bool rtl92e_disable_nic(struct net_device *dev) 
	rtllib_softmac_stop_protocol(priv->rtllib, 0, false);

	rtllib_softmac_stop_protocol(priv->rtllib, 0, false);

	priv->rtllib->state = tmp_state;

	priv->rtllib->state = tmp_state;

	rtl8192_cancel_deferred_work(priv);

	rtl8192_cancel_deferred_work(priv);

	rtl8192_irq_disable(dev);

	rtl92e_irq_disable(dev);





	priv->ops->stop_adapter(dev, false);

	priv->ops->stop_adapter(dev, false);

	RT_TRACE(COMP_PS, "<=========%s()\n", __func__);

	RT_TRACE(COMP_PS, "<=========%s()\n", __func__);

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -597,13 +597,11 @@ void rtl92e_check_rfctrl_gpio_timer(unsigned long data); 




void rtl8192_hw_wakeup_wq(void *data);

void rtl8192_hw_wakeup_wq(void *data);





void rtl8192_irq_disable(struct net_device *dev);



void rtl8192_pci_resetdescring(struct net_device *dev);

void rtl8192_pci_resetdescring(struct net_device *dev);

void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode);

void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode);

void rtl8192_irq_enable(struct net_device *dev);

void rtl8192_irq_enable(struct net_device *dev);

void rtl92e_config_rate(struct net_device *dev, u16 *rate_config);

void rtl92e_config_rate(struct net_device *dev, u16 *rate_config);

void rtl8192_irq_disable(struct net_device *dev);

void rtl92e_irq_disable(struct net_device *dev);





void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,

void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,

				  struct rtllib_rx_stats *stats);

				  struct rtllib_rx_stats *stats);