usb: host: Replace empty define with do while

It's dangerous to use empty code define.
Furthermore it lead to the following warning:
"suggest braces around empty body in an « else » statement"

So let's replace emptyness by "do {} while(0)"

Furthermore, as suggested by Joe Perches, rename the macro to INCR.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index e8d7667828eb4a8c884a1e441486022328e3ac82..cdafa97f632d5493f4a81e1330fda9e975bb4ede 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -730,9 +730,9 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
        /* normal [4.15.1.2] or error [4.15.1.1] completion */
        if (likely ((status & (STS_INT|STS_ERR)) != 0)) {
                if (likely ((status & STS_ERR) == 0))
-                       COUNT (ehci->stats.normal);
+                       INCR(ehci->stats.normal);
                else
-                       COUNT (ehci->stats.error);
+                       INCR(ehci->stats.error);
                bh = 1;
        }
 
@@ -756,7 +756,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                if (cmd & CMD_IAAD)
                        ehci_dbg(ehci, "IAA with IAAD still set?\n");
                if (ehci->iaa_in_progress)
-                       COUNT(ehci->stats.iaa);
+                       INCR(ehci->stats.iaa);
                end_iaa_cycle(ehci);
        }
 

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 3276304056952b5d377ffb55971e62140c414760..aa2f77f1506ddadead56753697b7d7c8a494c592 100644 (file)
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -245,12 +245,12 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
        }
 
        if (unlikely(urb->unlinked)) {
-               COUNT(ehci->stats.unlink);
+               INCR(ehci->stats.unlink);
        } else {
                /* report non-error and short read status as zero */
                if (status == -EINPROGRESS || status == -EREMOTEIO)
                        status = 0;
-               COUNT(ehci->stats.complete);
+               INCR(ehci->stats.complete);
        }
 
 #ifdef EHCI_URB_TRACE

diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index 4fcebda4b79d3bad9078e2eb130cf9d74bd0010f..a79c8ac0a55fad1835f3feff687ae2a8bb0c7158 100644 (file)
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -347,7 +347,7 @@ static void ehci_iaa_watchdog(struct ehci_hcd *ehci)
         */
        status = ehci_readl(ehci, &ehci->regs->status);
        if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
-               COUNT(ehci->stats.lost_iaa);
+               INCR(ehci->stats.lost_iaa);
                ehci_writel(ehci, STS_IAA, &ehci->regs->status);
        }
 

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index c8e9a48e1d517db699120899368355d84441cecf..ac5e967907d1412fc403256d22a5369807275eca 100644 (file)
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -235,9 +235,9 @@ struct ehci_hcd {                   /* one per controller */
        /* irq statistics */
 #ifdef EHCI_STATS
        struct ehci_stats       stats;
-#      define COUNT(x) ((x)++)
+#      define INCR(x) ((x)++)
 #else
-#      define COUNT(x)
+#      define INCR(x) do {} while (0)
 #endif
 
        /* debug files */

diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index bbcc68179bfcf8456163199f2c4248d615532708..0da68df259c8600644db989f247904822002e9b7 100644 (file)
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -1286,7 +1286,7 @@ static void fotg210_iaa_watchdog(struct fotg210_hcd *fotg210)
                 */
                status = fotg210_readl(fotg210, &fotg210->regs->status);
                if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {
-                       COUNT(fotg210->stats.lost_iaa);
+                       INCR(fotg210->stats.lost_iaa);
                        fotg210_writel(fotg210, STS_IAA,
                                        &fotg210->regs->status);
                }
@@ -2205,12 +2205,12 @@ __acquires(fotg210->lock)
        }
 
        if (unlikely(urb->unlinked)) {
-               COUNT(fotg210->stats.unlink);
+               INCR(fotg210->stats.unlink);
        } else {
                /* report non-error and short read status as zero */
                if (status == -EINPROGRESS || status == -EREMOTEIO)
                        status = 0;
-               COUNT(fotg210->stats.complete);
+               INCR(fotg210->stats.complete);
        }
 
 #ifdef FOTG210_URB_TRACE
@@ -5154,9 +5154,9 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
        /* normal [4.15.1.2] or error [4.15.1.1] completion */
        if (likely((status & (STS_INT|STS_ERR)) != 0)) {
                if (likely((status & STS_ERR) == 0))
-                       COUNT(fotg210->stats.normal);
+                       INCR(fotg210->stats.normal);
                else
-                       COUNT(fotg210->stats.error);
+                       INCR(fotg210->stats.error);
                bh = 1;
        }
 
@@ -5181,7 +5181,7 @@ static irqreturn_t fotg210_irq(struct usb_hcd *hcd)
                if (cmd & CMD_IAAD)
                        fotg210_dbg(fotg210, "IAA with IAAD still set?\n");
                if (fotg210->async_iaa) {
-                       COUNT(fotg210->stats.iaa);
+                       INCR(fotg210->stats.iaa);
                        end_unlink_async(fotg210);
                } else
                        fotg210_dbg(fotg210, "IAA with nothing unlinked?\n");

diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
index 28f6467c0cbf8d23d46c61c88087dfb531c1a894..1b4db95e5c43aef564e6f47fb5fd441d1b954634 100644 (file)
--- a/drivers/usb/host/fotg210.h
+++ b/drivers/usb/host/fotg210.h
@@ -177,9 +177,9 @@ struct fotg210_hcd {                        /* one per controller */
        /* irq statistics */
 #ifdef FOTG210_STATS
        struct fotg210_stats    stats;
-#      define COUNT(x) ((x)++)
+#      define INCR(x) ((x)++)
 #else
-#      define COUNT(x)
+#      define INCR(x) do {} while (0)
 #endif
 
        /* silicon clock */