[PATCH 12/14] eeepc-wmi: refine quirks handling

From: Corentin Chary
Date: Tue Mar 20 2012 - 04:56:02 EST


Signed-off-by: Corentin Chary <corentin.chary@xxxxxxxxx>
---
drivers/platform/x86/eeepc-wmi.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 389ff88..0bb0aaf 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -49,7 +49,6 @@ MODULE_LICENSE("GPL");

MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID);

-static struct quirk_entry *quirks;
static bool hotplug_wireless;

module_param(hotplug_wireless, bool, 0444);
@@ -108,6 +107,8 @@ static struct quirk_entry quirk_asus_et2012_type3 = {
.store_backlight_power = true,
};

+static struct quirk_entry *quirks;
+
static int dmi_matched(const struct dmi_system_id *dmi)
{
char *model;
@@ -209,12 +210,14 @@ static int eeepc_wmi_probe(struct platform_device *pdev)

static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)
{
- driver->panel_power = FB_BLANK_UNBLANK;
- driver->quirks = &quirk_asus_unknown;
- driver->quirks->hotplug_wireless = hotplug_wireless;
- driver->quirks->wapf = -1;
+ quirks = &quirk_asus_unknown;
+ quirks->hotplug_wireless = hotplug_wireless;
+
dmi_check_system(asus_quirks);
+
driver->quirks = quirks;
+ driver->quirks->wapf = -1;
+ driver->panel_power = FB_BLANK_UNBLANK;
}

static struct asus_wmi_driver asus_wmi_driver = {
--
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/