Re: staging: rtl8723bs: bug or pointless if else ?

From: Hans de Goede
Date: Thu Jun 28 2018 - 11:01:24 EST


Hi,

On 28-06-18 17:00, Michael Straube wrote:
On 06/28/18 11:34, Bastien Nocera wrote:
On Thu, 2018-06-28 at 10:22 +0200, Hans de Goede wrote:
Hi,

On 28-06-18 09:43, Michael Straube wrote:
Hi,

I stumbled upon the following if else construct in
drivers/staging/rtl8723bs/os_dep/sdio_intf.c:618

ÂÂÂÂÂÂÂÂÂ if (pwrpriv->bInternalAutoSuspend)
ÂÂÂÂÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret = rtw_resume_process(padapter);
ÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ else
ÂÂÂÂÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ if (pwrpriv->wowlan_mode || pwrpriv-
wowlan_ap_mode)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret = rtw_resume_process(padapter);
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ else
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret = rtw_resume_process(padapter);
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ }

It does not matter if the conditions are true or not,
ret is always set to:

ret = rtw_resume_process(padapter)

Is this a bug or is the if else construct just pointless?

It probably is just pointless, my guess would be that once
upon a time there was a difference in the paths and at some
point that difference went away.

Quite:
https://github.com/hadess/rtl8723bs/blob/7d36e26f78bbc709844c12ad0c62e3e8503fdbc5/os_dep/linux/sdio_intf.c#L1757


So it can be safly removed?

Simplified to a single:

ret = rtw_resume_process(padapter);

Yes that should be fine.

Regards,

Hans