Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <685aee141a45b09c46089a8bc777a037261ab447.camel@perches.com>
Subject: Re: [PATCH] usb: Replace empty define with do while
From:   Joe Perches <joe@perches.com>
To:     Corentin Labbe <clabbe@baylibre.com>, gregkh@linuxfoundation.org,
        stern@rowland.harvard.edu
Cc:     linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Date:   Thu, 07 Jun 2018 13:16:45 -0700
In-Reply-To: <1528401911-5263-1-git-send-email-clabbe@baylibre.com>
References: <1528401911-5263-1-git-send-email-clabbe@baylibre.com>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, 2018-06-07 at 20:05 +0000, Corentin Labbe wrote:
> 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)"

I also suggest renaming COUNT to something more
intelligible like INCR as the uses are all for
incrementing variables that may not exist.

> diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
> index c8e9a48e1d51..a60d91eac771 100644
> --- a/drivers/usb/host/ehci.h
> +++ b/drivers/usb/host/ehci.h
> @@ -237,7 +237,7 @@ struct ehci_hcd {			/* one per controller */
>  	struct ehci_stats	stats;
>  #	define COUNT(x) ((x)++)
>  #else
> -#	define COUNT(x)
> +#	define COUNT(x) do {} while (0)
>  #endif
>  
>  	/* debug files */
> diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
> index 7fcd785c7bc8..dca46d04e288 100644
> --- a/drivers/usb/host/fotg210.h
> +++ b/drivers/usb/host/fotg210.h
> @@ -179,7 +179,7 @@ struct fotg210_hcd {			/* one per controller */
>  	struct fotg210_stats	stats;
>  #	define COUNT(x) ((x)++)
>  #else
> -#	define COUNT(x)
> +#	define COUNT(x) do {} while (0)
>  #endif
>  
>  	/* debug files */