From: Fabian Wolff <fabian.wolff@fau.de>
Date: Mon, 12 Jun 2017 10:46:13 +0000 (+0200)
Subject: staging: rtl8723bs: wifi_regd.c: remove superfluous braces
X-Git-Tag: v4.13-rc1~184^2~120
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8e1afccdcba281b8c529062cd5e4e055334c348;p=thirdparty%2Flinux.git

staging: rtl8723bs: wifi_regd.c: remove superfluous braces

This patch removes unnecessary braces in an if/else-construct, thereby
fixing both a checkpatch.pl warning about superfluous braces and an
error about an ill-placed closing brace preceding the "else" keyword.

Signed-off-by: Fabian Wolff <fabian.wolff@fau.de>
Signed-off-by: Mate Horvath <horvatmate@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index 6fbc935b08ca8..115ba661d0284 100644
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -96,12 +96,10 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)
 
 		ch = ieee80211_get_channel(wiphy, freq);
 		if (ch) {
-			if (channel_set[i].ScanType == SCAN_PASSIVE) {
+			if (channel_set[i].ScanType == SCAN_PASSIVE)
 				ch->flags = IEEE80211_CHAN_NO_IR;
-			}
-			else {
+			else
 				ch->flags = 0;
-			}
 		}
 	}
 }