From: Guillaume Clement <gclement@baobob.org>
To: Forest Bond <forest@alittletooquiet.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Guillaume Clement <gclement@baobob.org>
Subject: [PATCH 12/14] staging: vt6655: fix braces at newline in if statements
Date: Fri, 25 Jul 2014 01:06:26 +0200 [thread overview]
Message-ID: <1406243188-13413-13-git-send-email-gclement@baobob.org> (raw)
In-Reply-To: <1406243188-13413-1-git-send-email-gclement@baobob.org>
Braces should not be in a separate line for multi-line if
statements. This fixes warnings reported by checkpatch.
Signed-off-by: Guillaume Clement <gclement@baobob.org>
---
drivers/staging/vt6655/wcmd.c | 5 +++--
drivers/staging/vt6655/wpa.c | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 0c38fcf..f12eef0 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -432,9 +432,10 @@ vCommandTimer(
vAdHocBeaconRestart(pDevice);
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
- if (pMgmt->eScanType == WMAC_SCAN_PASSIVE)
- {//send scan event to wpa_Supplicant
+ if (pMgmt->eScanType == WMAC_SCAN_PASSIVE) {
+ //send scan event to wpa_Supplicant
union iwreq_data wrqu;
+
memset(&wrqu, 0, sizeof(wrqu));
wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
}
diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c
index 2bd9e1f..7b1bab9 100644
--- a/drivers/staging/vt6655/wpa.c
+++ b/drivers/staging/vt6655/wpa.c
@@ -123,8 +123,8 @@ WPA_ParseRSN(
&& (pRSN->wVersion == 1)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Legal RSN\n");
// update each variable if pRSN is long enough to contain the variable
- if (pRSN->len >= 10) //oui1(4)+ver(2)+GKSuite(4)
- {
+ if (pRSN->len >= 10) {
+ //OUI1(4)+ver(2)+GKSuite(4)
if (!memcmp(pRSN->abyMulticast, abyOUI01, 4))
pBSSList->byGKType = WPA_WEP40;
else if (!memcmp(pRSN->abyMulticast, abyOUI02, 4))
@@ -142,8 +142,8 @@ WPA_ParseRSN(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "byGKType: %x\n", pBSSList->byGKType);
}
- if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
- {
+ if (pRSN->len >= 12) {
+ //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
j = 0;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wPKCount: %d, sizeof(pBSSList->abyPKType): %zu\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
for (i = 0; (i < pRSN->wPKCount) && (j < ARRAY_SIZE(pBSSList->abyPKType)); i++) {
--
1.8.5.5
next prev parent reply other threads:[~2014-07-24 23:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 23:06 [PATCH 00/14] staging: vt6655: Sparse and checkpatch fixes Guillaume Clement
2014-07-24 23:06 ` [PATCH 01/14] staging: vt6655: remove useless return statements Guillaume Clement
2014-07-24 23:06 ` [PATCH 02/14] staging: vt6655: Add missing blank lines after declarations Guillaume Clement
2014-07-24 23:06 ` [PATCH 03/14] staging: vt6655: Remove spaces before quoted newlines Guillaume Clement
2014-07-24 23:06 ` [PATCH 04/14] staging: vt6655: fix function braces not on the proper line Guillaume Clement
2014-07-24 23:06 ` [PATCH 05/14] staging: vt6655: fix braces at newline for structs Guillaume Clement
2014-07-24 23:06 ` [PATCH 06/14] staging: vt6655: fix static position in inline function Guillaume Clement
2014-07-24 23:06 ` [PATCH 07/14] staging: vt6655: Use pr_* functions instead of printk Guillaume Clement
2014-07-24 23:06 ` [PATCH 08/14] staging: vt6655: break single line if statements Guillaume Clement
2014-07-24 23:06 ` [PATCH 09/14] staging: vt6655: Remove unreachable break statements Guillaume Clement
2014-07-24 23:06 ` [PATCH 10/14] staging: vt6655: add missing whitespace Guillaume Clement
2014-07-24 23:06 ` [PATCH 11/14] staging: vt6655: remove braces for single statements if Guillaume Clement
2014-07-24 23:06 ` Guillaume Clement [this message]
2014-07-24 23:06 ` [PATCH 13/14] staging: vt6655: remove unused macro Guillaume Clement
2014-07-24 23:06 ` [PATCH 14/14] staging: vt6655: Remove NULL pointer sparse warning Guillaume Clement
2014-07-25 11:50 ` [PATCH 00/14] staging: vt6655: Sparse and checkpatch fixes Dan Carpenter
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=1406243188-13413-13-git-send-email-gclement@baobob.org \
--to=gclement@baobob.org \
--cc=devel@driverdev.osuosl.org \
--cc=forest@alittletooquiet.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®