diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2022-09-05 11:01:56 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2022-09-05 11:01:56 +0200 |
| commit | 76fba1221e3045570478381c3436c8c2a2656376 (patch) | |
| tree | 9e900c43f641683b9e96a217b23d0e557d3f61b9 /drivers/platform/x86/toshiba_acpi.c | |
| parent | platform/x86: p2sb: Fix UAF when caller uses resource name (diff) | |
| parent | drm/todo: Add entry about dealing with brightness control on devices with > 1... (diff) | |
| download | linux-76fba1221e3045570478381c3436c8c2a2656376.tar.xz linux-76fba1221e3045570478381c3436c8c2a2656376.zip | |
Merge tag 'backlight-detect-refactor-1' into review-hans
Immutable backlight-detect-refactor branch between acpi, drm-* and pdx86
Tag (immutable branch) with v6.0-rc1 + the (acpi/x86) backlight
detect refactor work. For merging into the acpi, drm-* and pdx86
subsystems.
Diffstat (limited to 'drivers/platform/x86/toshiba_acpi.c')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 6cc617b2940e..900ee68a4c0b 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -272,14 +272,6 @@ static const struct key_entry toshiba_acpi_alt_keymap[] = { }; /* - * List of models which have a broken acpi-video backlight interface and thus - * need to use the toshiba (vendor) interface instead. - */ -static const struct dmi_system_id toshiba_vendor_backlight_dmi[] = { - {} -}; - -/* * Utility */ @@ -2884,14 +2876,6 @@ static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev) return 0; } - /* - * Tell acpi-video-detect code to prefer vendor backlight on all - * systems with transflective backlight and on dmi matched systems. - */ - if (dev->tr_backlight_supported || - dmi_check_system(toshiba_vendor_backlight_dmi)) - acpi_video_set_dmi_backlight_type(acpi_backlight_vendor); - if (acpi_video_get_backlight_type() != acpi_backlight_vendor) return 0; |