summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-11-17 14:00:19 +0100
committerMatthew Garrett <matthew.garrett@nebula.com>2013-11-20 18:50:48 -0500
commitd038880efd9dd222c67fd31fbfca3440d0db3a06 (patch)
treee0e2e1d2ba210e76bfebccf8776b132b19e2098d /drivers
parentddde708217af6d5fe43c0086247c05ed317076b4 (diff)
dell-laptop: Only get status from BIOS once when updating
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/dell-laptop.c28
1 files changed, 19 insertions, 9 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 48fabf6b6ecb..06f281bf7790 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -425,21 +425,24 @@ out:
return ret;
}
+static void dell_rfkill_update(struct rfkill *rfkill, int radio, int status)
+{
+ rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16)));
+
+ if (hwswitch_state & (BIT(radio - 1)))
+ rfkill_set_hw_state(rfkill, !(status & BIT(16)));
+}
+
static void dell_rfkill_query(struct rfkill *rfkill, void *data)
{
int status;
- int bit = (unsigned long)data + 16;
- int hwswitch_bit = (unsigned long)data - 1;
get_buffer();
dell_send_request(buffer, 17, 11);
status = buffer->output[1];
release_buffer();
- rfkill_set_sw_state(rfkill, !!(status & BIT(bit)));
-
- if (hwswitch_state & (BIT(hwswitch_bit)))
- rfkill_set_hw_state(rfkill, !(status & BIT(16)));
+ dell_rfkill_update(rfkill, (unsigned long)data, status);
}
static const struct rfkill_ops dell_rfkill_ops = {
@@ -518,12 +521,19 @@ static const struct file_operations dell_debugfs_fops = {
static void dell_update_rfkill(struct work_struct *ignored)
{
+ int status;
+
+ get_buffer();
+ dell_send_request(buffer, 17, 11);
+ status = buffer->output[1];
+ release_buffer();
+
if (wifi_rfkill)
- dell_rfkill_query(wifi_rfkill, (void *)1);
+ dell_rfkill_update(wifi_rfkill, 1, status);
if (bluetooth_rfkill)
- dell_rfkill_query(bluetooth_rfkill, (void *)2);
+ dell_rfkill_update(bluetooth_rfkill, 2, status);
if (wwan_rfkill)
- dell_rfkill_query(wwan_rfkill, (void *)3);
+ dell_rfkill_update(wwan_rfkill, 3, status);
}
static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);