Skip to content

Commit 3cb26e2

Browse files
committed
drm/i915/opregion: remove unnecessary ifdefs on CONFIG_ACPI
The whole file is ignored on CONFIG_ACPI=n. Reviewed-by: Ander Conselvan de Oliveira <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ce81a65 commit 3cb26e2

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

drivers/gpu/drm/i915/intel_opregion.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ struct opregion_asle_ext {
246246

247247
#define MAX_DSLP 1500
248248

249-
#ifdef CONFIG_ACPI
250249
static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
251250
{
252251
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -905,9 +904,6 @@ static void swsci_setup(struct drm_device *dev)
905904
opregion->swsci_gbda_sub_functions,
906905
opregion->swsci_sbcb_sub_functions);
907906
}
908-
#else /* CONFIG_ACPI */
909-
static inline void swsci_setup(struct drm_device *dev) {}
910-
#endif /* CONFIG_ACPI */
911907

912908
static int intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
913909
{
@@ -950,9 +946,7 @@ int intel_opregion_setup(struct drm_device *dev)
950946
return -ENOTSUPP;
951947
}
952948

953-
#ifdef CONFIG_ACPI
954949
INIT_WORK(&opregion->asle_work, asle_work);
955-
#endif
956950

957951
base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
958952
if (!base)

0 commit comments

Comments
 (0)