forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dell-laptop: Only get status from BIOS once when updating

Browse source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Hans de Goede 2013-11-17 14:00:19 +01:00 • committed by Matthew Garrett
parent ddde708217
commit d038880efd
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/platform/x86/dell-laptop.c
View file

@ -425,21 +425,24 @@ out:
return ret; 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) static void dell_rfkill_query(struct rfkill *rfkill, void *data)
{ {
int status; int status;
int bit = (unsigned long)data + 16;
int hwswitch_bit = (unsigned long)data - 1;
get_buffer(); get_buffer();
dell_send_request(buffer, 17, 11); dell_send_request(buffer, 17, 11);
status = buffer->output[1]; status = buffer->output[1];
release_buffer(); release_buffer();
rfkill_set_sw_state(rfkill, !!(status & BIT(bit))); dell_rfkill_update(rfkill, (unsigned long)data, status);
if (hwswitch_state & (BIT(hwswitch_bit)))
rfkill_set_hw_state(rfkill, !(status & BIT(16)));
} }
static const struct rfkill_ops dell_rfkill_ops = { 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) 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) if (wifi_rfkill)
dell_rfkill_query(wifi_rfkill, (void *)1); dell_rfkill_update(wifi_rfkill, 1, status);
if (bluetooth_rfkill) if (bluetooth_rfkill)
dell_rfkill_query(bluetooth_rfkill, (void *)2); dell_rfkill_update(bluetooth_rfkill, 2, status);
if (wwan_rfkill) 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); static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);