usb: sl811-hcd: improve misleading indentation

commit 8460f6003a1d2633737b89c4f69d6f4c0c7c65a3 upstream.

gcc-11 now warns about a confusingly indented code block:

drivers/usb/host/sl811-hcd.c: In function ‘sl811h_hub_control’:
drivers/usb/host/sl811-hcd.c:1291:9: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
 1291 |         if (*(u16*)(buf+2))     /* only if wPortChange is interesting */
      |         ^~
drivers/usb/host/sl811-hcd.c:1295:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
 1295 |                 break;

Rewrite this to use a single if() block with the __is_defined() macro.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210322164244.827589-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index fd2a11473be79921416597ae87489d4606d26f55..455c59fe32fa77a097629817c31a8a785558e467 100644 (file)
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1286,11 +1286,10 @@ sl811h_hub_control(
                        goto error;
                put_unaligned_le32(sl811->port1, buf);
 
-#ifndef        VERBOSE
-       if (*(u16*)(buf+2))     /* only if wPortChange is interesting */
-#endif
-               dev_dbg(hcd->self.controller, "GetPortStatus %08x\n",
-                       sl811->port1);
+               if (__is_defined(VERBOSE) ||
+                   *(u16*)(buf+2)) /* only if wPortChange is interesting */
+                       dev_dbg(hcd->self.controller, "GetPortStatus %08x\n",
+                               sl811->port1);
                break;
        case SetPortFeature:
                if (wIndex != 1 || wLength != 0)