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

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index a21da2f17774ba7da9501fced821d155c49ad703..65769013f67799ae4015918fd09f6082344585a4 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -41,7 +41,7 @@ void rtl92e_start_beacon(struct net_device *dev)
        u16 BcnCW = 6;
        u16 BcnIFS = 0xf;
 
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
 
        write_nic_word(dev, ATIMWND, 2);
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index b13014a91f76a7b8942d2efb0c9a8156782cfe85..d131c02566b966a57620843a9147919f164e4561 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -309,7 +309,7 @@ void rtl8192_irq_enable(struct net_device *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);
 
@@ -826,7 +826,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
        priv->rtllib->wpa_ie = NULL;
        rtl92e_cam_reset(dev);
        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);
        rtl8192_cancel_deferred_work(priv);
@@ -1102,7 +1102,7 @@ static short rtl8192_init(struct net_device *dev)
                    rtl92e_check_rfctrl_gpio_timer,
                    (unsigned long)dev);
 
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
        if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,
            dev->name, dev)) {
                netdev_err(dev, "Error allocating IRQ %d", dev->irq);
@@ -1301,7 +1301,7 @@ RESET_START:
                if (!netif_queue_stopped(dev))
                        netif_stop_queue(dev);
 
-               rtl8192_irq_disable(dev);
+               rtl92e_irq_disable(dev);
                del_timer_sync(&priv->watch_dog_timer);
                rtl8192_cancel_deferred_work(priv);
                deinit_hal_dm(dev);
@@ -2283,7 +2283,7 @@ void rtl92e_commit(struct net_device *dev)
        if (priv->up == 0)
                return;
        rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
        priv->ops->stop_adapter(dev, true);
        _rtl8192_up(dev, false);
 }
@@ -2816,7 +2816,7 @@ bool rtl92e_disable_nic(struct net_device *dev)
        rtllib_softmac_stop_protocol(priv->rtllib, 0, false);
        priv->rtllib->state = tmp_state;
        rtl8192_cancel_deferred_work(priv);
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
 
        priv->ops->stop_adapter(dev, false);
        RT_TRACE(COMP_PS, "<=========%s()\n", __func__);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index fe70e39a6b4d1992fbebd59a7473432b7a5fd9cf..1017a063cdd17a8cc7751dff92d837affe9b1502 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -597,13 +597,11 @@ void rtl92e_check_rfctrl_gpio_timer(unsigned long 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_SetWirelessMode(struct net_device *dev, u8 wireless_mode);
 void rtl8192_irq_enable(struct net_device *dev);
 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,
                                  struct rtllib_rx_stats *stats);