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/asus-wmi.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/asus-wmi.c')
| -rw-r--r-- | drivers/platform/x86/asus-wmi.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 11203213e00d..d95170b7dba0 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -3691,7 +3691,6 @@ static int asus_wmi_add(struct platform_device *pdev) struct platform_driver *pdrv = to_platform_driver(pdev->dev.driver); struct asus_wmi_driver *wdrv = to_asus_wmi_driver(pdrv); struct asus_wmi *asus; - const char *chassis_type; acpi_status status; int err; u32 result; @@ -3768,18 +3767,6 @@ static int asus_wmi_add(struct platform_device *pdev) if (asus->driver->quirks->wmi_force_als_set) asus_wmi_set_als(); - /* Some Asus desktop boards export an acpi-video backlight interface, - stop this from showing up */ - chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE); - if (chassis_type && !strcmp(chassis_type, "3")) - acpi_video_set_dmi_backlight_type(acpi_backlight_vendor); - - if (asus->driver->quirks->wmi_backlight_power) - acpi_video_set_dmi_backlight_type(acpi_backlight_vendor); - - if (asus->driver->quirks->wmi_backlight_native) - acpi_video_set_dmi_backlight_type(acpi_backlight_native); - if (asus->driver->quirks->xusb2pr) asus_wmi_set_xusb2pr(asus); |