diff mbox

[U-Boot,3/4] qbman_portal.c: Update BUG_ON() call in qbman_swp_mc_submit

Message ID 1448715883-14099-3-git-send-email-trini@konsulko.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Tom Rini Nov. 28, 2015, 1:04 p.m. UTC
With gcc-5.x we get a warning about the ambiguity of BUG_ON(!a != b) and
becomes BUG_ON((!a) != b).  In this case reading of the function leads to
us wanting to rewrite this as BUG_ON(a != b).

Cc: Prabhakar Kushwaha <prabhakar@freescale.com>
Cc: Geoff Thorpe <Geoff.Thorpe@freescale.com>
Cc: Haiying Wang <Haiying.Wang@freescale.com>
Cc: Roy Pledge <Roy.Pledge@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/fsl-mc/dpio/qbman_portal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bin Meng Nov. 29, 2015, 9:34 a.m. UTC | #1
On Sat, Nov 28, 2015 at 9:04 PM, Tom Rini <trini@konsulko.com> wrote:
> With gcc-5.x we get a warning about the ambiguity of BUG_ON(!a != b) and
> becomes BUG_ON((!a) != b).  In this case reading of the function leads to
> us wanting to rewrite this as BUG_ON(a != b).
>
> Cc: Prabhakar Kushwaha <prabhakar@freescale.com>
> Cc: Geoff Thorpe <Geoff.Thorpe@freescale.com>
> Cc: Haiying Wang <Haiying.Wang@freescale.com>
> Cc: Roy Pledge <Roy.Pledge@freescale.com>
> Cc: York Sun <yorksun@freescale.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  drivers/net/fsl-mc/dpio/qbman_portal.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
> index 5fa8d95..449ff8a 100644
> --- a/drivers/net/fsl-mc/dpio/qbman_portal.c
> +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
> @@ -117,7 +117,7 @@ void qbman_swp_mc_submit(struct qbman_swp *p, void *cmd, uint32_t cmd_verb)
>  {
>         uint32_t *v = cmd;
>  #ifdef QBMAN_CHECKING
> -       BUG_ON(!p->mc.check != swp_mc_can_submit);
> +       BUG_ON(p->mc.check != swp_mc_can_submit);
>  #endif
>         lwsync();
>         /* TBD: "|=" is going to hurt performance. Need to move as many fields
> --

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
York Sun Dec. 15, 2015, 12:52 a.m. UTC | #2
On 11/28/2015 09:04 PM, Tom Rini wrote:
> With gcc-5.x we get a warning about the ambiguity of BUG_ON(!a != b) and
> becomes BUG_ON((!a) != b).  In this case reading of the function leads to
> us wanting to rewrite this as BUG_ON(a != b).
> 
> Cc: Prabhakar Kushwaha <prabhakar@freescale.com>
> Cc: Geoff Thorpe <Geoff.Thorpe@freescale.com>
> Cc: Haiying Wang <Haiying.Wang@freescale.com>
> Cc: Roy Pledge <Roy.Pledge@freescale.com>
> Cc: York Sun <yorksun@freescale.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---

Applied to fsl-qoriq master. Awaiting upstream.

York
diff mbox

Patch

diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c
index 5fa8d95..449ff8a 100644
--- a/drivers/net/fsl-mc/dpio/qbman_portal.c
+++ b/drivers/net/fsl-mc/dpio/qbman_portal.c
@@ -117,7 +117,7 @@  void qbman_swp_mc_submit(struct qbman_swp *p, void *cmd, uint32_t cmd_verb)
 {
 	uint32_t *v = cmd;
 #ifdef QBMAN_CHECKING
-	BUG_ON(!p->mc.check != swp_mc_can_submit);
+	BUG_ON(p->mc.check != swp_mc_can_submit);
 #endif
 	lwsync();
 	/* TBD: "|=" is going to hurt performance. Need to move as many fields