From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 5 Sep 2022 09:01:56 +0000 (+0200)
Subject: Merge tag 'backlight-detect-refactor-1' into review-hans
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=76fba1221e3045570478381c3436c8c2a2656376;p=linux.git

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.
---

76fba1221e3045570478381c3436c8c2a2656376
diff --cc drivers/platform/x86/asus-wmi.h
index 0187f13d24148,f30252efe1db0..65316998b898a
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@@ -36,11 -29,10 +36,9 @@@ struct quirk_entry 
  	bool hotplug_wireless;
  	bool scalar_panel_brightness;
  	bool store_backlight_power;
- 	bool wmi_backlight_power;
- 	bool wmi_backlight_native;
  	bool wmi_backlight_set_devstate;
  	bool wmi_force_als_set;
 -	bool use_kbd_dock_devid;
 -	bool use_lid_flip_devid;
 +	enum asus_wmi_tablet_switch_mode tablet_switch_mode;
  	int wapf;
  	/*
  	 * For machines with AMD graphic chips, it will send out WMI event