2023-06-22 10:26:27

by Arnd Bergmann

Subject: [PATCH] i915: avoid unused-but-set-variable warning

From: Arnd Bergmann <[email protected]>

The mchbar_addr variable is only used inside of an #ifdef:

drivers/gpu/drm/i915/soc/intel_gmch.c:41:6: error: variable 'mchbar_addr' set but not used [-Werror,-Wunused-but-set-variable]

Change this to an IS_ENABLED() check to let the compiler see how
it's used and no longer warn about it.

Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/soc/intel_gmch.c
index 6d0204942f7a5..49c7fb16e934f 100644
--- a/drivers/gpu/drm/i915/soc/intel_gmch.c
+++ b/drivers/gpu/drm/i915/soc/intel_gmch.c
@@ -47,11 +47,9 @@ intel_alloc_mchbar_resource(struct drm_i915_private *i915)
mchbar_addr = ((u64)temp_hi << 32) | temp_lo;

/* If ACPI doesn't have it, assume we need to allocate it ourselves */
-#ifdef CONFIG_PNP
- if (mchbar_addr &&
+ if (IS_ENABLED(CONFIG_PNP) && mchbar_addr &&
pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE))
return 0;
-#endif

/* Get some space for it */
i915->gmch.mch_res.name = "i915 MCHBAR";
--
2.39.2

2023-06-22 13:50:59

by Andi Shyti

Subject: Re: [Intel-gfx] [PATCH] i915: avoid unused-but-set-variable warning

Hi Arnd,

On Thu, Jun 22, 2023 at 12:18:41PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The mchbar_addr variable is only used inside of an #ifdef:
>
> drivers/gpu/drm/i915/soc/intel_gmch.c:41:6: error: variable 'mchbar_addr' set but not used [-Werror,-Wunused-but-set-variable]
>
> Change this to an IS_ENABLED() check to let the compiler see how
> it's used and no longer warn about it.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Reviewed-by: Andi Shyti <[email protected]>

Thanks,
Andi

2023-06-26 08:28:18

by Andi Shyti

Subject: Re: [Intel-gfx] [PATCH] i915: avoid unused-but-set-variable warning

Hi Arnd,

On Thu, Jun 22, 2023 at 12:18:41PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The mchbar_addr variable is only used inside of an #ifdef:
>
> drivers/gpu/drm/i915/soc/intel_gmch.c:41:6: error: variable 'mchbar_addr' set but not used [-Werror,-Wunused-but-set-variable]
>
> Change this to an IS_ENABLED() check to let the compiler see how
> it's used and no longer warn about it.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/soc/intel_gmch.c
> index 6d0204942f7a5..49c7fb16e934f 100644
> --- a/drivers/gpu/drm/i915/soc/intel_gmch.c
> +++ b/drivers/gpu/drm/i915/soc/intel_gmch.c
> @@ -47,11 +47,9 @@ intel_alloc_mchbar_resource(struct drm_i915_private *i915)
> mchbar_addr = ((u64)temp_hi << 32) | temp_lo;
>
> /* If ACPI doesn't have it, assume we need to allocate it ourselves */
> -#ifdef CONFIG_PNP
> - if (mchbar_addr &&
> + if (IS_ENABLED(CONFIG_PNP) && mchbar_addr &&
> pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE))
> return 0;
> -#endif

you actually already sent this same patch[*] and I did push it in
drm-intel-next.

Andi

[*] https://patchwork.freedesktop.org/patch/542054/

>
> /* Get some space for it */
> i915->gmch.mch_res.name = "i915 MCHBAR";
> --
> 2.39.2