From: Corentin Chary <corentin.chary@gmail.com>
To: Matthew Garrett <mjg@redhat.com>
Cc: platform-driver-x86@vger.kernel.org,
Corentin Chary <corentin.chary@gmail.com>,
Corentin Chary <corentincj@iksaif.net>,
acpi4asus-user@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: [PATCH 13/14] eeepc-wmi: split et2012 specific hacks
Date: Tue, 20 Mar 2012 09:53:13 +0100 [thread overview]
Message-ID: <1332233594-13099-14-git-send-email-corentin.chary@gmail.com> (raw)
In-Reply-To: <1332233594-13099-1-git-send-email-corentin.chary@gmail.com>
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
drivers/platform/x86/eeepc-wmi.c | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 0bb0aaf..6567613 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -109,26 +109,32 @@ static struct quirk_entry quirk_asus_et2012_type3 = {
static struct quirk_entry *quirks;
+static void et2012_quirks(void)
+{
+ const struct dmi_device *dev = NULL;
+ char oemstring[30];
+
+ while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
+ if (sscanf(dev->name, "AEMS%24c", oemstring) == 1) {
+ if (oemstring[18] == '1')
+ quirks = &quirk_asus_et2012_type1;
+ else if (oemstring[18] == '3')
+ quirks = &quirk_asus_et2012_type3;
+ break;
+ }
+ }
+}
+
static int dmi_matched(const struct dmi_system_id *dmi)
{
char *model;
+
quirks = dmi->driver_data;
model = (char *)dmi->matches[1].substr;
- if (unlikely(strncmp(model, "ET2012", 6) == 0)) {
- const struct dmi_device *dev = NULL;
- char oemstring[30];
- while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
- NULL, dev))) {
- if (sscanf(dev->name, "AEMS%24c", oemstring) == 1) {
- if (oemstring[18] == '1')
- quirks = &quirk_asus_et2012_type1;
- else if (oemstring[18] == '3')
- quirks = &quirk_asus_et2012_type3;
- break;
- }
- }
- }
+ if (unlikely(strncmp(model, "ET2012", 6) == 0))
+ et2012_quirks();
+
return 1;
}
--
1.7.3.4
next prev parent reply other threads:[~2012-03-20 8:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1332233594-13099-1-git-send-email-corentin.chary@gmail.com>
2012-03-20 8:53 ` [PATCH 01/14] ACPI / Video: blacklist some samsung laptops Corentin Chary
2012-03-20 16:05 ` Matthew Garrett
2012-03-20 16:28 ` Corentin Chary
2012-03-20 16:30 ` Matthew Garrett
2012-03-22 13:08 ` [PATCH] samsung-laptop: unregister ACPI video module for some well known laptops Corentin Chary
2012-03-27 9:11 ` Corentin Chary
2012-03-27 11:21 ` Matthew Garrett
2012-04-06 9:42 ` Corentin Chary
2012-04-06 14:34 ` Seth Forshee
2012-04-17 8:31 ` Corentin Chary
2012-03-20 8:53 ` [PATCH 02/14] asus-nb-wmi: ignore useless keys Corentin Chary
2012-03-20 8:53 ` [PATCH 03/14] eeepc-wmi: add extra keymaps for EP121 Corentin Chary
2012-03-20 8:53 ` [PATCH 04/14] asus-wmi: on/off bit is not set when reading the value Corentin Chary
2012-03-20 8:53 ` [PATCH 05/14] drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb Corentin Chary
2012-03-20 8:53 ` [PATCH 06/14] drivers, samsung-laptop: fix usage of isalnum Corentin Chary
2012-03-20 8:53 ` [PATCH 07/14] samsung-laptop: cleanup return type: mode_t vs umode_t Corentin Chary
2012-03-20 8:53 ` [PATCH 08/14] asus-wmi: add scalar board brightness adj. support Corentin Chary
2012-03-20 8:53 ` [PATCH 09/14] asus-wmi: store backlight power status for AIO machine Corentin Chary
2012-03-20 8:53 ` [PATCH 10/14] asus-wmi: move WAPF variable into quirks_entry Corentin Chary
2012-03-20 8:53 ` [PATCH 11/14] asus-nb-wmi: set panel_power correctly Corentin Chary
2012-03-20 8:53 ` [PATCH 12/14] eeepc-wmi: refine quirks handling Corentin Chary
2012-03-20 8:53 ` Corentin Chary [this message]
2012-03-20 8:53 ` [PATCH 14/14] asus-wmi: don't update power and brightness when using scalar Corentin Chary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332233594-13099-14-git-send-email-corentin.chary@gmail.com \
--to=corentin.chary@gmail.com \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=corentincj@iksaif.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).