Skip to content

Commit 2b5002e

Browse files
PhilPottergregkh
authored andcommitted
staging: r8188eu: convert rtw_pwr_wakeup to correct error code semantics
Convert the rtw_pwr_wakeup function to use 0 on success and an appropriate error code on error. For the first failure block where ips_leave is invoked, use -ENOMEM as this is the main cause of failure here anyway. For the second failure block, use -EBUSY, as it seems the most appropriate. Finally, within the functions rtw_wx_set_mode, rtw_wx_set_wap, rtw_wx_set_scan and rtw_wx_set_essid, pass the error code on from rtw_pwr_wakeup as appropriate now that it is converted. This gets the driver closer to removal of the non-standard _SUCCESS and _FAIL definitions, which are inverted compared to the standard in-kernel error code mechanism. Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150 Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Phillip Potter <phil@philpotter.co.uk> Link: https://lore.kernel.org/r/20220725220745.12739-1-phil@philpotter.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4709238 commit 2b5002e

3 files changed

Lines changed: 15 additions & 23 deletions

File tree

drivers/staging/r8188eu/core/rtw_p2p.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
18881888

18891889
if (role == P2P_ROLE_DEVICE || role == P2P_ROLE_CLIENT || role == P2P_ROLE_GO) {
18901890
/* leave IPS/Autosuspend */
1891-
if (rtw_pwr_wakeup(padapter) == _FAIL) {
1891+
if (rtw_pwr_wakeup(padapter)) {
18921892
ret = _FAIL;
18931893
goto exit;
18941894
}
@@ -1902,7 +1902,7 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
19021902
init_wifidirect_info(padapter, role);
19031903

19041904
} else if (role == P2P_ROLE_DISABLE) {
1905-
if (rtw_pwr_wakeup(padapter) == _FAIL) {
1905+
if (rtw_pwr_wakeup(padapter)) {
19061906
ret = _FAIL;
19071907
goto exit;
19081908
}

drivers/staging/r8188eu/core/rtw_pwrctrl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,24 +381,24 @@ int rtw_pwr_wakeup(struct adapter *padapter)
381381
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
382382
unsigned long timeout = jiffies + msecs_to_jiffies(3000);
383383
unsigned long deny_time;
384-
int ret = _SUCCESS;
384+
int ret = 0;
385385

386386
while (pwrpriv->ps_processing && time_before(jiffies, timeout))
387387
msleep(10);
388388

389389
/* I think this should be check in IPS, LPS, autosuspend functions... */
390390
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
391-
ret = _SUCCESS;
391+
ret = 0;
392392
goto exit;
393393
}
394394

395395
if (pwrpriv->rf_pwrstate == rf_off && ips_leave(padapter) == _FAIL) {
396-
ret = _FAIL;
396+
ret = -ENOMEM;
397397
goto exit;
398398
}
399399

400400
if (padapter->bDriverStopped || !padapter->bup || !padapter->hw_init_completed) {
401-
ret = _FAIL;
401+
ret = -EBUSY;
402402
goto exit;
403403
}
404404

@@ -439,7 +439,7 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
439439
return 0;
440440
} else if (mode == IPS_NONE) {
441441
rtw_ips_mode_req(pwrctrlpriv, mode);
442-
if ((padapter->bSurpriseRemoved == 0) && (rtw_pwr_wakeup(padapter) == _FAIL))
442+
if ((padapter->bSurpriseRemoved == 0) && rtw_pwr_wakeup(padapter))
443443
return -EFAULT;
444444
} else {
445445
return -EINVAL;

drivers/staging/r8188eu/os_dep/ioctl_linux.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -687,12 +687,9 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
687687
enum ndis_802_11_network_infra networkType;
688688
int ret = 0;
689689

690-
691-
692-
if (_FAIL == rtw_pwr_wakeup(padapter)) {
693-
ret = -EPERM;
690+
ret = rtw_pwr_wakeup(padapter);
691+
if (ret)
694692
goto exit;
695-
}
696693

697694
if (!padapter->hw_init_completed) {
698695
ret = -EPERM;
@@ -931,12 +928,9 @@ static int rtw_wx_set_wap(struct net_device *dev,
931928
struct wlan_network *pnetwork = NULL;
932929
enum ndis_802_11_auth_mode authmode;
933930

934-
935-
936-
if (_FAIL == rtw_pwr_wakeup(padapter)) {
937-
ret = -1;
931+
ret = rtw_pwr_wakeup(padapter);
932+
if (ret)
938933
goto exit;
939-
}
940934

941935
if (!padapter->bup) {
942936
ret = -1;
@@ -1049,10 +1043,9 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
10491043
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
10501044
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
10511045

1052-
if (_FAIL == rtw_pwr_wakeup(padapter)) {
1053-
ret = -1;
1046+
ret = rtw_pwr_wakeup(padapter);
1047+
if (ret)
10541048
goto exit;
1055-
}
10561049

10571050
if (padapter->bDriverStopped) {
10581051
ret = -1;
@@ -1252,10 +1245,9 @@ static int rtw_wx_set_essid(struct net_device *dev,
12521245

12531246
uint ret = 0, len;
12541247

1255-
if (_FAIL == rtw_pwr_wakeup(padapter)) {
1256-
ret = -1;
1248+
ret = rtw_pwr_wakeup(padapter);
1249+
if (ret)
12571250
goto exit;
1258-
}
12591251

12601252
if (!padapter->bup) {
12611253
ret = -1;

0 commit comments

Comments
 (0)