[Intel-gfx] [PATCH] drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI

Ander Conselvan De Oliveira conselvan2 at gmail.com
Tue Apr 12 10:33:35 UTC 2016


On Fri, 2016-04-08 at 17:59 +0300, Jani Nikula wrote:
> The whole file is ignored on CONFIG_ACPI=n.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ander Conselvan de Oliveira <conselvan2 at gmail.com>

> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 6 ------
>  1 file changed, 6 deletions(-)

> diff --git a/drivers/gpu/drm/i915/intel_opregion.c
> b/drivers/gpu/drm/i915/intel_opregion.c
> index c15718b4862a..d5a4cb80273e 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -246,7 +246,6 @@ struct opregion_asle_ext {
>  
>  #define MAX_DSLP	1500
>  
> -#ifdef CONFIG_ACPI
>  static int swsci(struct drm_device *dev, u32 function, u32 parm, u32
> *parm_out)
>  {
>  	struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -905,9 +904,6 @@ static void swsci_setup(struct drm_device *dev)
>  			 opregion->swsci_gbda_sub_functions,
>  			 opregion->swsci_sbcb_sub_functions);
>  }
> -#else /* CONFIG_ACPI */
> -static inline void swsci_setup(struct drm_device *dev) {}
> -#endif  /* CONFIG_ACPI */
>  
>  static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
>  {
> @@ -950,9 +946,7 @@ int intel_opregion_setup(struct drm_device *dev)
>  		return -ENOTSUPP;
>  	}
>  
> -#ifdef CONFIG_ACPI
>  	INIT_WORK(&opregion->asle_work, asle_work);
> -#endif
>  
>  	base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
>  	if (!base)


More information about the Intel-gfx mailing list