drm/i915/gmch: fix build error var set but not used
Subsystems (2)
PATCH 1/1 drm/i915/gmch: fix build error var set but not used
When CONFIG_PNP is not defined, i915 will fail to compile with error bellow:
drivers/gpu/drm/i915/soc/intel_gmch.c:43:13: error: variable ‘mchbar_addr’ set but not used
Fix it by surrounding variable declaration and assignment with ifdef
--- drivers/gpu/drm/i915/soc/intel_gmch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/soc/intel_gmch.c +4 -3
@@ -38,16 +38,17 @@ intel_alloc_mchbar_resource(struct drm_i915_private *i915) {int reg =GRAPHICS_VER (i915) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ; -u64 mchbar_addr;int ret; - +#ifdef CONFIG_PNP +u64 mchbar_addr; +#endif if (GRAPHICS_VER (i915) >=4 )pci_read_config_dword (i915->gmch.pdev, reg +4 , &temp_hi);pci_read_config_dword (i915->gmch.pdev, reg, &temp_lo); - mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;/* If ACPI doesn't have it, assume we need to allocate it ourselves */ #ifdef CONFIG_PNP + mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;if (mchbar_addr &&pnp_range_reserved (mchbar_addr, mchbar_addr +MCHBAR_SIZE ))return 0 ;
Signature · 1 line
2.40.0
Jani Nikula
maintainerQuoted 5 lines · Wang Jinchao
When
CONFIG_PNPis not defined, i915 will fail to compile with error bellow:
drivers/gpu/drm/i915/soc/intel_gmch.c:43:13: error: variable ‘mchbar_addr’ set but not used
Fix it by surrounding variable declaration and assignment with ifdefSigned-off-by Wang Jinchao <[email protected]>
Thanks for the patch, but this was fixed a couple of months ago by commit b02a9a0c6cb3 ("drm/i915/gmch: avoid unused variable warning").
Please check the development trees or linux-next before sending fixes.
Thanks,
Jani.
Quoted 29 lines
--- drivers/gpu/drm/i915/soc/intel_gmch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/soc/intel_gmch.c +4
-3@@ -38,16 +38,17 @@ intel_alloc_mchbar_resource(struct drm_i915_private *i915) {int reg =GRAPHICS_VER (i915) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ; -u64 mchbar_addr;int ret; - +#ifdef CONFIG_PNP +u64 mchbar_addr; +#endif if (GRAPHICS_VER (i915) >=4 )pci_read_config_dword (i915->gmch.pdev, reg +4 , &temp_hi);pci_read_config_dword (i915->gmch.pdev, reg, &temp_lo); - mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;/* If ACPI doesn't have it, assume we need to allocate it ourselves */ #ifdef CONFIG_PNP + mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;if (mchbar_addr &&pnp_range_reserved (mchbar_addr, mchbar_addr +MCHBAR_SIZE ))return 0 ;
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gmch: fix build error var set but not used
In reply to Wang Jinchao== Series Details ==
== Series Details ==
Series: drm/i915/gmch: fix build error var set but not used
URL : https://patchwork.freedesktop.org/series/122416/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/122416/revisions/1/mbox/ not applied
Applying: drm/i915/gmch: fix build error var set but not used
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/soc/intel_gmch.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/soc/intel_gmch.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/soc/intel_gmch.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gmch: fix build error var set but not used
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced