[PATCH] drm/i915: Fix new -Wint-in-bool-context gcc compiler warning

[PATCH] drm/i915: Fix new -Wint-in-bool-context gcc compiler warning

[Hans de Goede]

This commit fixes the following compiler warning:

drivers/gpu/drm/i915/intel_dsi.c: In function ‘intel_dsi_prepare’:
drivers/gpu/drm/i915/intel_dsi.c:1487:23: warning:
    ?: using integer constants in boolean context [-Wint-in-bool-context]
       PORT_A ? PORT_C : PORT_A),

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/gpu/drm/i915/i915_reg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 11b12f412492..db5c49531033 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8276,7 +8276,7 @@ enum {
 
 /* MIPI DSI registers */
 
-#define _MIPI_PORT(port, a, c)	((port) ? c : a)	/* ports A and C only */
+#define _MIPI_PORT(port, a, c)	(((port) == PORT_A) ? a : c)	/* ports A and C only */
 #define _MMIO_MIPI(port, a, c)	_MMIO(_MIPI_PORT(port, a, c))
 
 #define MIPIO_TXESC_CLK_DIV1			_MMIO(0x160004)
-- 
2.12.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix new -Wint-in-bool-context gcc compiler warning

[Jani Nikula]

On Thu, 18 May 2017, Hans de Goede <hdegoede@redhat.com> wrote:
> This commit fixes the following compiler warning:
>
> drivers/gpu/drm/i915/intel_dsi.c: In function ‘intel_dsi_prepare’:
> drivers/gpu/drm/i915/intel_dsi.c:1487:23: warning:
>     ?: using integer constants in boolean context [-Wint-in-bool-context]
>        PORT_A ? PORT_C : PORT_A),
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Pushed to drm-intel-next-queued, thanks for the patch.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 11b12f412492..db5c49531033 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -8276,7 +8276,7 @@ enum {
>  
>  /* MIPI DSI registers */
>  
> -#define _MIPI_PORT(port, a, c)	((port) ? c : a)	/* ports A and C only */
> +#define _MIPI_PORT(port, a, c)	(((port) == PORT_A) ? a : c)	/* ports A and C only */
>  #define _MMIO_MIPI(port, a, c)	_MMIO(_MIPI_PORT(port, a, c))
>  
>  #define MIPIO_TXESC_CLK_DIV1			_MMIO(0x160004)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx