Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a2bcccd authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett
Browse files

asus-wmi: move WAPF variable into quirks_entry 



Some models work better with different values of wapf, so move the
variable into quriks_entry to make it more easy to give a specific
value to different models.

Based on original patch from AceLan Kao <acelan.kao@canonical.com>

Cc: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 6e0044be

drivers/platform/x86/asus-nb-wmi.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -51,9 +51,13 @@ static uint wapf; 
module_param(wapf, uint, 0444);

module_param(wapf, uint, 0444);

MODULE_PARM_DESC(wapf, "WAPF value");

MODULE_PARM_DESC(wapf, "WAPF value");





static struct quirk_entry quirk_asus_unknown = {

};



static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)

static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)

{

{

	driver->wapf = wapf;

	driver->quirks = &quirk_asus_unknown;

	driver->quirks->wapf = wapf;

}

}





static const struct key_entry asus_nb_wmi_keymap[] = {

static const struct key_entry asus_nb_wmi_keymap[] = {

drivers/platform/x86/asus-wmi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1471,9 +1471,9 @@ static int asus_wmi_platform_init(struct asus_wmi *asus) 




	/* CWAP allow to define the behavior of the Fn+F2 key,

	/* CWAP allow to define the behavior of the Fn+F2 key,

	 * this method doesn't seems to be present on Eee PCs */

	 * this method doesn't seems to be present on Eee PCs */

	if (asus->driver->wapf >= 0)

	if (asus->driver->quirks->wapf >= 0)

		asus_wmi_set_devstate(ASUS_WMI_DEVID_CWAP,

		asus_wmi_set_devstate(ASUS_WMI_DEVID_CWAP,

				      asus->driver->wapf, NULL);

				      asus->driver->quirks->wapf, NULL);





	return asus_wmi_sysfs_init(asus->platform_device);

	return asus_wmi_sysfs_init(asus->platform_device);

}

}

drivers/platform/x86/asus-wmi.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,10 +39,10 @@ struct quirk_entry { 
	bool hotplug_wireless;

	bool hotplug_wireless;

	bool scalar_panel_brightness;

	bool scalar_panel_brightness;

	bool store_backlight_power;

	bool store_backlight_power;

	int wapf;

};

};





struct asus_wmi_driver {

struct asus_wmi_driver {

	int			wapf;

	int			brightness;

	int			brightness;

	int			panel_power;

	int			panel_power;

drivers/platform/x86/eeepc-wmi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,10 +209,10 @@ static int eeepc_wmi_probe(struct platform_device *pdev) 




static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)

static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)

{

{

	driver->wapf = -1;

	driver->panel_power = FB_BLANK_UNBLANK;

	driver->panel_power = FB_BLANK_UNBLANK;

	driver->quirks = &quirk_asus_unknown;

	driver->quirks = &quirk_asus_unknown;

	driver->quirks->hotplug_wireless = hotplug_wireless;

	driver->quirks->hotplug_wireless = hotplug_wireless;

	driver->quirks->wapf = -1;

	dmi_check_system(asus_quirks);

	dmi_check_system(asus_quirks);

	driver->quirks = quirks;

	driver->quirks = quirks;

}

}