From: Ike Panhc <ike.pan@canonical.com>
To: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Matthew Garrett <mjg@redhat.com>, Len Brown <len.brown@intel.com>,
Corentin Chary <corentincj@iksaif.net>,
David Woodhouse <David.Woodhouse@intel.com>,
Mario.Holbe@TU-Ilmenau.DE
Subject: [PATCH 4/9] ideapad: use return value of _CFG to tell if device exist or not
Date: Fri, 1 Oct 2010 15:39:29 +0800 [thread overview]
Message-ID: <1285918769-12971-1-git-send-email-ike.pan@canonical.com> (raw)
In-Reply-To: <1285918660-12802-1-git-send-email-ike.pan@canonical.com>
There are several bits of the return value of _CFG shows if RF/Camera devices
exist or not.
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
drivers/platform/x86/ideapad_acpi.c | 44 ++++++++---------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/drivers/platform/x86/ideapad_acpi.c b/drivers/platform/x86/ideapad_acpi.c
index 9face93..43a1c89 100644
--- a/drivers/platform/x86/ideapad_acpi.c
+++ b/drivers/platform/x86/ideapad_acpi.c
@@ -40,13 +40,14 @@ struct ideapad_private {
static struct {
char *name;
+ int cfgbit;
int type;
} ideapad_rfk_data[] = {
- /* camera has no rfkill */
- { "ideapad_wlan", RFKILL_TYPE_WLAN },
- { "ideapad_bluetooth", RFKILL_TYPE_BLUETOOTH },
- { "ideapad_3g", RFKILL_TYPE_WWAN },
- { "ideapad_killsw", RFKILL_TYPE_WLAN }
+ { "ideapad_camera", 19, NUM_RFKILL_TYPES },
+ { "ideapad_wlan", 18, RFKILL_TYPE_WLAN },
+ { "ideapad_bluetooth", 16, RFKILL_TYPE_BLUETOOTH },
+ { "ideapad_3g", 17, RFKILL_TYPE_WWAN },
+ { "ideapad_killsw", 0, RFKILL_TYPE_WLAN }
};
/*
@@ -158,32 +159,6 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
}
/* the above is ACPI helpers */
-static int ideapad_dev_exists(int device)
-{
- acpi_status status;
- union acpi_object in_param;
- struct acpi_object_list input = { 1, &in_param };
- struct acpi_buffer output;
- union acpi_object out_obj;
-
- output.length = sizeof(out_obj);
- output.pointer = &out_obj;
-
- in_param.type = ACPI_TYPE_INTEGER;
- in_param.integer.value = device + 1;
-
- status = acpi_evaluate_object(NULL, "\\_SB_.DECN", &input, &output);
- if (ACPI_FAILURE(status)) {
- printk(KERN_WARNING "IdeaPAD \\_SB_.DECN method failed %d. Is this an IdeaPAD?\n", status);
- return -ENODEV;
- }
- if (out_obj.type != ACPI_TYPE_INTEGER) {
- printk(KERN_WARNING "IdeaPAD \\_SB_.DECN method returned unexpected type\n");
- return -ENODEV;
- }
- return out_obj.integer.value;
-}
-
static int ideapad_dev_get_state(int device)
{
acpi_status status;
@@ -334,9 +309,10 @@ static int ideapad_acpi_add(struct acpi_device *adevice)
return -ENODEV;
for (i = IDEAPAD_DEV_CAMERA; i < IDEAPAD_DEV_KILLSW; i++) {
- devs_present[i] = ideapad_dev_exists(i);
- if (devs_present[i] < 0)
- return devs_present[i];
+ if (test_bit(ideapad_rfk_data[i].cfgbit, (unsigned long *)&cfg))
+ devs_present[i] = 1;
+ else
+ devs_present[i] = 0;
}
/* The hardware switch is always present */
--
1.7.1
next prev parent reply other threads:[~2010-10-01 7:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 7:37 [Resend] [PATCH 0/9] ideapad: using EC command to control rf/camera power Ike Panhc
2010-10-01 7:38 ` [PATCH 1/9] ideapad: add ACPI helpers Ike Panhc
2010-10-01 7:39 ` [PATCH 2/9] ideapad: check VPC bit before sync rfkill hw status Ike Panhc
2010-10-01 7:39 ` [PATCH 3/9] ideapad: make sure we bind on the correct device Ike Panhc
2010-10-01 7:39 ` Ike Panhc [this message]
2010-10-01 7:39 ` [PATCH 5/9] ideapad: use EC command to control camera Ike Panhc
2010-10-01 7:39 ` [PATCH 6/9] ideapad: rewrite the hw rfkill notify Ike Panhc
2010-10-01 7:39 ` [PATCH 7/9] ideapad: rewrite the sw rfkill set Ike Panhc
2010-10-01 7:40 ` [PATCH 8/9] ideapad: Change the driver name to ideapad-laptop Ike Panhc
2010-10-01 7:40 ` [PATCH 9/9] ideapad: Add param: no_bt_rfkill Ike Panhc
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=1285918769-12971-1-git-send-email-ike.pan@canonical.com \
--to=ike.pan@canonical.com \
--cc=David.Woodhouse@intel.com \
--cc=Mario.Holbe@TU-Ilmenau.DE \
--cc=corentincj@iksaif.net \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--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).