[Intel-gfx] [PATCH] drm/i915: Fixup stub definitions for intel_opregion_suspend|resume

[Randy Dunlap]

On 11/29/18 1:05 PM, Chris Wilson wrote:
> 248 "multiple definition of ...".  E.g.:
> 
>     LD [M]  drivers/gpu/drm/i915/i915.o
>   ld: drivers/gpu/drm/i915/i915_irq.o: in function `intel_opregion_resume':
>   i915_irq.c:(.text+0x58f0): multiple definition of `intel_opregion_resume';
>   drivers/gpu/drm/i915/i915_drv.o:i915_drv.c:(.text+0x2d40): first defined here
> 
> Reported-by: Randy Dunlap <rdunlap at infradead.org>
> Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> Fixes: a950adc6c343 ("drm/i915: Stop calling intel_opregion unregister/register in suspend/resume")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Acked-by: Randy Dunlap <rdunlap at infradead.org> # build tested

Thanks.

> ---
>  drivers/gpu/drm/i915/intel_opregion.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.h b/drivers/gpu/drm/i915/intel_opregion.h
> index d84b6d2d2fae..4aa68ffbd30e 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.h
> +++ b/drivers/gpu/drm/i915/intel_opregion.h
> @@ -87,12 +87,12 @@ static inline void intel_opregion_unregister(struct drm_i915_private *dev_priv)
>  {
>  }
>  
> -void intel_opregion_resume(struct drm_i915_private *dev_priv)
> +static inline void intel_opregion_resume(struct drm_i915_private *dev_priv)
>  {
>  }
>  
> -void intel_opregion_suspend(struct drm_i915_private *dev_priv,
> -			    pci_power_t state)
> +static inline void intel_opregion_suspend(struct drm_i915_private *dev_priv,
> +					  pci_power_t state)
>  {
>  }
>  
> 


-- 
~Randy