* [PATCH v4 0/2] staging: lustre: align else if statement to coding standard
@ 2017-02-06 16:11 Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 1/2] staging: lustre: move logical continuations at the end of line Maksymilian Piechota
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Maksymilian Piechota @ 2017-02-06 16:11 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: maksymilian.piechota, linux-kernel, devel
Align else if statement to normal kernel style
Maksymilian Piechota (2):
staging: lustre: move logical continuations at the end of line
staging: lustre: move else if statement to a single line
drivers/staging/wlan-ng/prism2mgmt.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v4 1/2] staging: lustre: move logical continuations at the end of line
2017-02-06 16:11 [PATCH v4 0/2] staging: lustre: align else if statement to coding standard Maksymilian Piechota
@ 2017-02-06 16:13 ` Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 2/2] staging: lustre: move else if statement to a single line Maksymilian Piechota
2017-02-11 17:16 ` [PATCH v4 0/2] staging: lustre: align else if statement to coding standard James Simmons
2 siblings, 0 replies; 5+ messages in thread
From: Maksymilian Piechota @ 2017-02-06 16:13 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: maksymilian.piechota, linux-kernel, devel
Signed-off-by: Maksymilian Piechota <maksymilianpiechota@gmail.com>
---
drivers/staging/wlan-ng/prism2mgmt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 16fb2d3..64a9ebc 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1308,9 +1308,8 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
hw->sniffhdr = 0;
wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
} else
- if ((msg->wlanheader.status ==
- P80211ENUM_msgitem_status_data_ok)
- && (msg->wlanheader.data == P80211ENUM_truth_true)) {
+ if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
+ (msg->wlanheader.data == P80211ENUM_truth_true)) {
hw->sniffhdr = 1;
wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
} else {
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v4 2/2] staging: lustre: move else if statement to a single line
2017-02-06 16:11 [PATCH v4 0/2] staging: lustre: align else if statement to coding standard Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 1/2] staging: lustre: move logical continuations at the end of line Maksymilian Piechota
@ 2017-02-06 16:13 ` Maksymilian Piechota
2017-02-06 17:55 ` Joe Perches
2017-02-11 17:16 ` [PATCH v4 0/2] staging: lustre: align else if statement to coding standard James Simmons
2 siblings, 1 reply; 5+ messages in thread
From: Maksymilian Piechota @ 2017-02-06 16:13 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: maksymilian.piechota, linux-kernel, devel
Signed-off-by: Maksymilian Piechota <maksymilianpiechota@gmail.com>
---
drivers/staging/wlan-ng/prism2mgmt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 64a9ebc..af83f2a 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
&& (msg->prismheader.data == P80211ENUM_truth_true)) {
hw->sniffhdr = 0;
wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
- } else
- if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
+ } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
(msg->wlanheader.data == P80211ENUM_truth_true)) {
hw->sniffhdr = 1;
wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v4 2/2] staging: lustre: move else if statement to a single line
2017-02-06 16:13 ` [PATCH v4 2/2] staging: lustre: move else if statement to a single line Maksymilian Piechota
@ 2017-02-06 17:55 ` Joe Perches
0 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2017-02-06 17:55 UTC (permalink / raw)
To: Maksymilian Piechota, Greg Kroah-Hartman
Cc: maksymilian.piechota, linux-kernel, devel
On Mon, 2017-02-06 at 11:13 -0500, Maksymilian Piechota wrote:
> diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
[]
> @@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
> && (msg->prismheader.data == P80211ENUM_truth_true)) {
> hw->sniffhdr = 0;
> wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
> - } else
> - if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
> + } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
> (msg->wlanheader.data == P80211ENUM_truth_true)) {
> hw->sniffhdr = 1;
> wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
Hi again.
When you change the else if on multiple lines to a single line,
you should also realign the continuation like:
} else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
(msg->wlanheader.data == P80211ENUM_truth_true)) {
Using 3 tabs then 3 spaces
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 0/2] staging: lustre: align else if statement to coding standard
2017-02-06 16:11 [PATCH v4 0/2] staging: lustre: align else if statement to coding standard Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 1/2] staging: lustre: move logical continuations at the end of line Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 2/2] staging: lustre: move else if statement to a single line Maksymilian Piechota
@ 2017-02-11 17:16 ` James Simmons
2 siblings, 0 replies; 5+ messages in thread
From: James Simmons @ 2017-02-11 17:16 UTC (permalink / raw)
To: Maksymilian Piechota
Cc: Greg Kroah-Hartman, devel, maksymilian.piechota, linux-kernel
> Align else if statement to normal kernel style
>
> Maksymilian Piechota (2):
> staging: lustre: move logical continuations at the end of line
> staging: lustre: move else if statement to a single line
Its not lustre :-)
> drivers/staging/wlan-ng/prism2mgmt.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> --
> 2.1.4
>
> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-11 17:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-06 16:11 [PATCH v4 0/2] staging: lustre: align else if statement to coding standard Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 1/2] staging: lustre: move logical continuations at the end of line Maksymilian Piechota
2017-02-06 16:13 ` [PATCH v4 2/2] staging: lustre: move else if statement to a single line Maksymilian Piechota
2017-02-06 17:55 ` Joe Perches
2017-02-11 17:16 ` [PATCH v4 0/2] staging: lustre: align else if statement to coding standard James Simmons
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome