Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb26e26 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI 



The whole file is ignored on CONFIG_ACPI=n.

Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460127589-8357-1-git-send-email-jani.nikula@intel.com
parent ce81a65c

drivers/gpu/drm/i915/intel_opregion.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -246,7 +246,6 @@ struct opregion_asle_ext { 




#define MAX_DSLP	1500

#define MAX_DSLP	1500





#ifdef CONFIG_ACPI

static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)

static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	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_gbda_sub_functions,

			 opregion->swsci_sbcb_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)

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;

		return -ENOTSUPP;

	}

	}





#ifdef CONFIG_ACPI

	INIT_WORK(&opregion->asle_work, asle_work);

	INIT_WORK(&opregion->asle_work, asle_work);

#endif





	base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);

	base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);

	if (!base)

	if (!base)