staging:r8188eu: remove wrappers for LedControl8188eu function

There is no reason to use these wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index f1f4788dbd86ce4a3f4ec5df9429883483183f42..36109cec87062047054f9a77910ddb40091bb86e 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -308,7 +308,7 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
                mod_timer(&pmlmepriv->scan_to_timer,
                          jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
 
-               rtw_led_control(padapter, LED_CTL_SITE_SURVEY);
+               LedControl8188eu(padapter, LED_CTL_SITE_SURVEY);
 
                pmlmepriv->scan_interval = SCAN_INTERVAL;/*  30*2 sec = 60sec */
        } else {
@@ -335,7 +335,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
        u8      res = _SUCCESS;
 
 
-       rtw_led_control(padapter, LED_CTL_START_TO_LINK);
+       LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
 
        if (pmlmepriv->assoc_ssid.SsidLength == 0)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
@@ -379,7 +379,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
 
-       rtw_led_control(padapter, LED_CTL_START_TO_LINK);
+       LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
 
        if (pmlmepriv->assoc_ssid.SsidLength == 0)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index ee2dcd05010f6f07c9ff0e6f8648763bfd09dc00..032f783b0d83a8be86ab7609349da6c331158038 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -801,7 +801,7 @@ void rtw_indicate_connect(struct adapter *padapter)
        if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
                set_fwstate(pmlmepriv, _FW_LINKED);
 
-               rtw_led_control(padapter, LED_CTL_LINK);
+               LedControl8188eu(padapter, LED_CTL_LINK);
 
                rtw_os_indicate_connect(padapter);
        }
@@ -833,7 +833,7 @@ void rtw_indicate_disconnect(struct adapter *padapter)
                rtw_os_indicate_disconnect(padapter);
 
                _clr_fwstate_(pmlmepriv, _FW_LINKED);
-               rtw_led_control(padapter, LED_CTL_NO_LINK);
+               LedControl8188eu(padapter, LED_CTL_NO_LINK);
                rtw_clear_scan_deny(padapter);
        }
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index fc6385bc8a54fe81e677cdbc9872faf8f0f8be86..4032121a06f36c82c943b26208940af219204215 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -56,7 +56,7 @@ static int rtw_hw_suspend(struct adapter *padapter)
                if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                        _clr_fwstate_(pmlmepriv, _FW_LINKED);
 
-                       rtw_led_control(padapter, LED_CTL_NO_LINK);
+                       LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
                        rtw_os_indicate_disconnect(padapter);
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 65ae11ed6b7ce11ce2af735ba99c95ba211eaee8..1b544e650acffcb7e50ac8cb723cfe1acf065665 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1293,7 +1293,7 @@ static int validate_recv_frame(struct adapter *adapter,
                retval = _FAIL; /*  only data frame return _SUCCESS */
                break;
        case WIFI_DATA_TYPE: /* data */
-               rtw_led_control(adapter, LED_CTL_RX);
+               LedControl8188eu(adapter, LED_CTL_RX);
                pattrib->qos = (subtype & BIT(7)) ? 1 : 0;
                retval = validate_recv_data_frame(adapter, precv_frame);
                if (retval == _FAIL) {
@@ -1988,7 +1988,7 @@ static int recv_func_posthandle(struct adapter *padapter,
        struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
        /*  DATA FRAME */
-       rtw_led_control(padapter, LED_CTL_RX);
+       LedControl8188eu(padapter, LED_CTL_RX);
 
        prframe = decryptor(padapter, prframe);
        if (prframe == NULL) {

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 0f8b8e0bffdf9826a6f6e8e7b226a9ac6ab53268..2b641f59c504d7f64e83b075b720177a0fc2ce19 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -1677,7 +1677,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
        }
        pxmitframe->pkt = *ppkt;
 
-       rtw_led_control(padapter, LED_CTL_TX);
+       LedControl8188eu(padapter, LED_CTL_TX);
 
        pxmitframe->attrib.qsel = pxmitframe->attrib.priority;
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 780666a755ee30514414d850e0fc7d2c14c5161e..fe075ad163c7a5168de36b1e9839623ac6306f73 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -70,7 +70,6 @@ void rtw_hal_sw_led_init(struct adapter *padapter)
        struct led_priv *pledpriv = &(padapter->ledpriv);
 
        pledpriv->bRegUseLed = true;
-       pledpriv->LedControlHandler = LedControl8188eu;
        padapter->HalData->bLedOpenDrain = true;
 
        InitLed871x(padapter, &(pledpriv->SwLed0));

diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index f2054ef70358ac6456371ff4290966e6934949f9..79f318f94088eb0c724614eaadb6d8a6e037ead7 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -92,17 +92,9 @@ struct led_priv {
        /* add for led control */
        struct LED_871x                 SwLed0;
        u8      bRegUseLed;
-       void (*LedControlHandler)(struct adapter *padapter,
-                                 enum LED_CTL_MODE LedAction);
        /* add for led control */
 };
 
-#define rtw_led_control(adapt, action) \
-       do { \
-               if ((adapt)->ledpriv.LedControlHandler) \
-                       (adapt)->ledpriv.LedControlHandler((adapt), (action)); \
-       } while (0)
-
 void BlinkTimerCallback(unsigned long data);
 void BlinkWorkItemCallback(struct work_struct *work);
 

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 2a1e63de7d15261805cfc6f44cac8ba19ba82e25..c933883ed2256b766c594272ff2135cde18cbcb4 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -597,7 +597,7 @@ static int _netdev_open(struct net_device *pnetdev)
                }
                rtw_hal_inirp_init(padapter);
 
-               rtw_led_control(padapter, LED_CTL_NO_LINK);
+               LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
                padapter->bup = true;
        }
@@ -681,7 +681,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
 
        result = ips_netdrv_open(padapter);
 
-       rtw_led_control(padapter, LED_CTL_NO_LINK);
+       LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
        DBG_88E("<===  rtw_ips_pwr_up.............. in %dms\n",
                jiffies_to_msecs(jiffies - start_time));
@@ -696,7 +696,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
 
        padapter->net_closed = true;
 
-       rtw_led_control(padapter, LED_CTL_POWER_OFF);
+       LedControl8188eu(padapter, LED_CTL_POWER_OFF);
 
        rtw_ips_dev_unload(padapter);
        DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n",
@@ -749,7 +749,7 @@ static int netdev_close(struct net_device *pnetdev)
                /* s2-4. */
                rtw_free_network_queue(padapter, true);
                /*  Close LED */
-               rtw_led_control(padapter, LED_CTL_POWER_OFF);
+               LedControl8188eu(padapter, LED_CTL_POWER_OFF);
        }
 
        RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-88eu_drv - drv_close\n"));