]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
authorJani Nikula <jani.nikula@intel.com>
Fri, 8 Apr 2016 14:59:49 +0000 (17:59 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 13 Apr 2016 12:54:29 +0000 (15:54 +0300)
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
drivers/gpu/drm/i915/intel_opregion.c

index d3c4945a0e364db47c52bbf7c7ba5d8e35d2362d..2ae0314f2cf606e5bf53734a54fc316ac368d0b7 100644 (file)
@@ -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)