From: Srivathsa Dara <srivathsa729.8@gmail.com>
To: jerome.pouiller@silabs.com, gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Srivathsa Dara <srivathsa729.8@gmail.com>
Subject: [PATCH] staging: wfx: sta: Fix 'else' coding style warning
Date: Tue, 14 Sep 2021 20:01:06 +0530 [thread overview]
Message-ID: <20210914143107.18436-1-srivathsa729.8@gmail.com> (raw)
Fix 'else is not generally useful after a break or return' checkpatch
warning
Signed-off-by: Srivathsa Dara <srivathsa729.8@gmail.com>
---
drivers/staging/wfx/sta.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index aceb18a1f54b..23c0425e3929 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -169,19 +169,18 @@ static int wfx_get_ps_timeout(struct wfx_vif *wvif, bool *enable_ps)
if (wvif->vif->bss_conf.assoc && wvif->vif->bss_conf.ps)
dev_info(wvif->wdev->dev, "ignoring requested PS mode");
return -1;
- } else {
- /* It is necessary to enable PS if channels
- * are different.
- */
- if (enable_ps)
- *enable_ps = true;
- if (wvif->wdev->force_ps_timeout > -1)
- return wvif->wdev->force_ps_timeout;
- else if (wfx_api_older_than(wvif->wdev, 3, 2))
- return 0;
- else
- return 30;
}
+ /* It is necessary to enable PS if channels
+ * are different.
+ */
+ if (enable_ps)
+ *enable_ps = true;
+ if (wvif->wdev->force_ps_timeout > -1)
+ return wvif->wdev->force_ps_timeout;
+ else if (wfx_api_older_than(wvif->wdev, 3, 2))
+ return 0;
+ else
+ return 30;
}
if (enable_ps)
*enable_ps = wvif->vif->bss_conf.ps;
--
2.25.1
next reply other threads:[~2021-09-14 14:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 14:31 Srivathsa Dara [this message]
2021-09-14 14:56 ` [PATCH] staging: wfx: sta: Fix 'else' coding style warning Dan Carpenter
2021-09-17 14:24 ` Greg KH
2021-09-17 14:33 ` Jérôme Pouiller
2021-09-17 14:59 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914143107.18436-1-srivathsa729.8@gmail.com \
--to=srivathsa729.8@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jerome.pouiller@silabs.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox