The WMI-ACPI driver now supports architectures other than x86. Remove the CONFIG_X86 handling from video-detect and the associated GPU drivers to simplify the resulting code.
Acked-by: Rafael J. Wysocki (Intel) <[email protected]> Signed-off-by: Armin Wolf <[email protected]> --- drivers/acpi/Kconfig | 2 +- drivers/acpi/video_detect.c | 8 -------- drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +--- drivers/gpu/drm/gma500/Kconfig | 1 - drivers/gpu/drm/i915/Kconfig | 1 - drivers/gpu/drm/radeon/Kconfig | 4 +--- drivers/gpu/drm/xe/Kconfig | 5 ++--- 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f165d14cf61a..cc1e58fa664b 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -224,7 +224,7 @@ config ACPI_VIDEO tristate "Video" depends on BACKLIGHT_CLASS_DEVICE depends on INPUT - depends on ACPI_WMI || !X86 + depends on ACPI_WMI select THERMAL help This driver implements the ACPI Extensions For Display Adapters diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 458efa4fe9d4..af9280b244f1 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -82,8 +82,6 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; } -/* This depends on ACPI_WMI which is X86 only */ -#ifdef CONFIG_X86 static bool nvidia_wmi_ec_supported(void) { struct wmi_brightness_args args = { @@ -105,12 +103,6 @@ static bool nvidia_wmi_ec_supported(void) */ return args.ret == WMI_BRIGHTNESS_SOURCE_EC; } -#else -static bool nvidia_wmi_ec_supported(void) -{ - return false; -} -#endif /* Force to use vendor driver when the ACPI device is known to be * buggy */ diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig index 12e4a41bf1f0..50305630f533 100644 --- a/drivers/gpu/drm/amd/amdgpu/Kconfig +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig @@ -30,9 +30,7 @@ config DRM_AMDGPU # ACPI_VIDEO's dependencies must also be selected. select INPUT if ACPI select ACPI_VIDEO if ACPI - # On x86 ACPI_VIDEO also needs ACPI_WMI - select X86_PLATFORM_DEVICES if ACPI && X86 - select ACPI_WMI if ACPI && X86 + select ACPI_WMI if ACPI help Choose this option if you have a recent AMD Radeon graphics card. diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index a2acaa699dd5..dc4c56638819 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -11,7 +11,6 @@ config DRM_GMA500 select ACPI_VIDEO if ACPI select BACKLIGHT_CLASS_DEVICE if ACPI select INPUT if ACPI - select X86_PLATFORM_DEVICES if ACPI select ACPI_WMI if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 5e939004b646..71426b9c91f0 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -28,7 +28,6 @@ config DRM_I915 # but for select to work, need to select ACPI_VIDEO's dependencies, ick select BACKLIGHT_CLASS_DEVICE if ACPI select INPUT if ACPI - select X86_PLATFORM_DEVICES if ACPI select ACPI_WMI if ACPI select ACPI_VIDEO if ACPI select SYNC_FILE diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig index c479f0c0dd5c..3cd70aef770e 100644 --- a/drivers/gpu/drm/radeon/Kconfig +++ b/drivers/gpu/drm/radeon/Kconfig @@ -25,9 +25,7 @@ config DRM_RADEON # ACPI_VIDEO's dependencies must also be selected. select INPUT if ACPI select ACPI_VIDEO if ACPI - # On x86 ACPI_VIDEO also needs ACPI_WMI - select X86_PLATFORM_DEVICES if ACPI && X86 - select ACPI_WMI if ACPI && X86 + select ACPI_WMI if ACPI help Choose this option if you have an ATI Radeon graphics card. There are both PCI and AGP versions. You don't need to choose this to diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 4d7dcaff2b91..502c7b3c1f16 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -4,7 +4,6 @@ config DRM_XE depends on DRM && PCI depends on KUNIT || !KUNIT depends on INTEL_VSEC || !INTEL_VSEC - depends on X86_PLATFORM_DEVICES || !(X86 && ACPI) depends on PAGE_SIZE_4KB || COMPILE_TEST || BROKEN select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular @@ -29,8 +28,8 @@ config DRM_XE # but for select to work, need to select ACPI_VIDEO's dependencies, ick select BACKLIGHT_CLASS_DEVICE if ACPI select INPUT if ACPI - select ACPI_VIDEO if X86 && ACPI - select ACPI_WMI if X86 && ACPI + select ACPI_VIDEO if ACPI + select ACPI_WMI if ACPI select SYNC_FILE select CRC32 select SND_HDA_I915 if SND_HDA_CORE -- 2.39.5
