diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2016-04-08 17:59:49 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-04-13 15:54:29 +0300 |
| commit | 3cb26e26edd12b11b98bbe2b8c89c3a0da79e390 (patch) | |
| tree | 9555df36e1111d207cf5d57cea7fb359f8379a6c /drivers/gpu/drm/i915/intel_opregion.c | |
| parent | drm/i915: Adjust size of PIPE_CONTROL used for gen8 render seqno write (diff) | |
| download | linux-dev-3cb26e26edd12b11b98bbe2b8c89c3a0da79e390.tar.xz linux-dev-3cb26e26edd12b11b98bbe2b8c89c3a0da79e390.zip | |
drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
The whole file is ignored on CONFIG_ACPI=n.
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460127589-8357-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index d3c4945a0e36..2ae0314f2cf6 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) |