linux-kernel - [PATCH] usb: dwc3: avoid empty-body warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 16 Nov 2016 16:37:30 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     Felipe Balbi <balbi@...nel.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:     Arnd Bergmann <arnd@...db.de>, John Youn <johnyoun@...opsys.com>,
        linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] usb: dwc3: avoid empty-body warning

Building with W=1, we get a warning about harmless empty statements:

drivers/usb/dwc3/ep0.c: In function 'dwc3_ep0_handle_intf':
drivers/usb/dwc3/ep0.c:491:4: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

gcc does not warn about {} here, so maybe use that instead.
Alternatively, the code could be removed entirely as it does
nothing.

Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
This has been present in the driver for a while, but the code
just moved around, so it showed up as a new warning for me.
I hope to eventually address all W=1 warnings as they tend to
find real bugs elsewhere and we may as well fix it now that the
code has changed.
---
 drivers/usb/dwc3/ep0.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 2b22ea7263d8..1e93cfc8f88b 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -486,12 +486,12 @@ static int dwc3_ep0_handle_intf(struct dwc3 *dwc,
 
 	switch (wValue) {
 	case USB_INTRF_FUNC_SUSPEND:
-		if (wIndex & USB_INTRF_FUNC_SUSPEND_LP)
+		if (wIndex & USB_INTRF_FUNC_SUSPEND_LP) {
 			/* XXX enable Low power suspend */
-			;
-		if (wIndex & USB_INTRF_FUNC_SUSPEND_RW)
+		}
+		if (wIndex & USB_INTRF_FUNC_SUSPEND_RW) {
 			/* XXX enable remote wakeup */
-			;
+		}
 		break;
 	default:
 		ret = -EINVAL;
-- 
2.9.0