diff options
author | Corentin Chary <corentin.chary@gmail.com> | 2012-03-20 09:53:10 +0100 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-03-26 15:05:44 -0400 |
commit | 6a2bcccdb3206950d28e343476d9050e23e79b7e (patch) | |
tree | 2ee2cdd1b1290875b4ef18322d6d81ff16d1ccd1 /drivers/platform | |
parent | 6e0044bedc1fc94a61cc32fa25dcab9a4e4a9218 (diff) |
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: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/asus-nb-wmi.c | 6 | ||||
-rw-r--r-- | drivers/platform/x86/asus-wmi.c | 4 | ||||
-rw-r--r-- | drivers/platform/x86/asus-wmi.h | 2 | ||||
-rw-r--r-- | drivers/platform/x86/eeepc-wmi.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 1aea6b8019b..b12038c492c 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -51,9 +51,13 @@ static uint wapf; module_param(wapf, uint, 0444); MODULE_PARM_DESC(wapf, "WAPF value"); +static struct quirk_entry quirk_asus_unknown = { +}; + 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[] = { diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index c4ad76ee7b5..ff9cfd83b09 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -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, * 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->driver->wapf, NULL); + asus->driver->quirks->wapf, NULL); return asus_wmi_sysfs_init(asus->platform_device); } diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h index 35003e4f131..d43b6674200 100644 --- a/drivers/platform/x86/asus-wmi.h +++ b/drivers/platform/x86/asus-wmi.h @@ -39,10 +39,10 @@ struct quirk_entry { bool hotplug_wireless; bool scalar_panel_brightness; bool store_backlight_power; + int wapf; }; struct asus_wmi_driver { - int wapf; int brightness; int panel_power; diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c index 9f8ccf9f590..389ff888cb6 100644 --- a/drivers/platform/x86/eeepc-wmi.c +++ b/drivers/platform/x86/eeepc-wmi.c @@ -209,10 +209,10 @@ static int eeepc_wmi_probe(struct platform_device *pdev) static void eeepc_wmi_quirks(struct asus_wmi_driver *driver) { - driver->wapf = -1; driver->panel_power = FB_BLANK_UNBLANK; driver->quirks = &quirk_asus_unknown; driver->quirks->hotplug_wireless = hotplug_wireless; + driver->quirks->wapf = -1; dmi_check_system(asus_quirks); driver->quirks = quirks; } |