[Intel-gfx] [PATCH] drm/i915/opregion: add missing intel_opregion_cleanup() dummy

[Intel-gfx] [PATCH] drm/i915/opregion: add missing intel_opregion_cleanup() dummy

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

When ACPI is disabled, i915 fails to build because of a missing
declaration:

drivers/gpu/drm/i915/i915_driver.c: In function 'i915_driver_hw_probe':
drivers/gpu/drm/i915/i915_driver.c:556:9: error: implicit declaration of function 'intel_opregion_cleanup'; did you mean 'intel_opregion_setup'? [-Werror=implicit-function-declaration]
  556 |         intel_opregion_cleanup(dev_priv);

Add another empty dummy helper next to intel_opregion_setup().

Fixes: 3e226e4a2180 ("drm/i915/opregion: Cleanup opregion after errors during driver loading")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/i915/display/intel_opregion.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
index 181eb3e9abbf..fd2ea8ef0fa2 100644
--- a/drivers/gpu/drm/i915/display/intel_opregion.h
+++ b/drivers/gpu/drm/i915/display/intel_opregion.h
@@ -86,6 +86,10 @@ static inline int intel_opregion_setup(struct drm_i915_private *dev_priv)
 	return 0;
 }
 
+static inline void intel_opregion_cleanup(struct drm_i915_private *i915)
+{
+}
+
 static inline void intel_opregion_register(struct drm_i915_private *dev_priv)
 {
 }
-- 
2.39.2

Re: [Intel-gfx] [PATCH] drm/i915/opregion: add missing intel_opregion_cleanup() dummy

[Imre Deak]

On Tue, Mar 14, 2023 at 05:25:18PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> When ACPI is disabled, i915 fails to build because of a missing
> declaration:

Hi Arnd,

thanks for catching this, I sent the same after the lkp note about the
build failure:

https://lore.kernel.org/intel-gfx/3238742c-0c57-b8cf-11fe-fd4a57979049@linux.intel.com/T/#me164308b49e975efb8d760e07a5ec9f4489916b9

--Imre

> 
> drivers/gpu/drm/i915/i915_driver.c: In function 'i915_driver_hw_probe':
> drivers/gpu/drm/i915/i915_driver.c:556:9: error: implicit declaration of function 'intel_opregion_cleanup'; did you mean 'intel_opregion_setup'? [-Werror=implicit-function-declaration]
>   556 |         intel_opregion_cleanup(dev_priv);
> 
> Add another empty dummy helper next to intel_opregion_setup().
> 
> Fixes: 3e226e4a2180 ("drm/i915/opregion: Cleanup opregion after errors during driver loading")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpu/drm/i915/display/intel_opregion.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
> index 181eb3e9abbf..fd2ea8ef0fa2 100644
> --- a/drivers/gpu/drm/i915/display/intel_opregion.h
> +++ b/drivers/gpu/drm/i915/display/intel_opregion.h
> @@ -86,6 +86,10 @@ static inline int intel_opregion_setup(struct drm_i915_private *dev_priv)
>  	return 0;
>  }
>  
> +static inline void intel_opregion_cleanup(struct drm_i915_private *i915)
> +{
> +}
> +
>  static inline void intel_opregion_register(struct drm_i915_private *dev_priv)
>  {
>  }
> -- 
> 2.39.2
>