p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

platform/x86: hp-wmi: Refactor dock and tablet state fetchers 

Both dock and tablet use the HPWMI_HARDWARE_QUERY, but require different
masks. Rather than using two functions with magic masks, define the
masks, and use a common accessor.

Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Tested-by: Carlo Caione <carlo@endlessm.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Darren Hart (VMware) 2017-04-19 17:03:38 -07:00
parent c7ef144c12
commit f9cf3b2880
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/platform/x86/hp-wmi.c
View File

@ -102,6 +102,11 @@ enum hp_wmi_command {
HPWMI_ODM = 0x03, HPWMI_ODM = 0x03,
}; };
enum hp_wmi_hardware_mask {
HPWMI_DOCK_MASK = 0x01,
HPWMI_TABLET_MASK = 0x04,
};
#define BIOS_ARGS_INIT(write, ctype, size) \ #define BIOS_ARGS_INIT(write, ctype, size) \
(struct bios_args) { .signature = 0x55434553, \ (struct bios_args) { .signature = 0x55434553, \
.command = (write) ? 0x2 : 0x1, \ .command = (write) ? 0x2 : 0x1, \
@ -271,7 +276,7 @@ static int hp_wmi_read_int(int query)
return val; return val;
} }
static int hp_wmi_dock_state(void) static int hp_wmi_hw_state(int mask)
{ {
int state = hp_wmi_read_int(HPWMI_HARDWARE_QUERY); int state = hp_wmi_read_int(HPWMI_HARDWARE_QUERY);
@ -281,16 +286,6 @@ static int hp_wmi_dock_state(void)
return state & 0x1; return state & 0x1;
} }
static int hp_wmi_tablet_state(void)
{
int state = hp_wmi_read_int(HPWMI_HARDWARE_QUERY);
if (state < 0)
return state;
return (state & 0x4) ? 1 : 0;
}
static int __init hp_wmi_bios_2008_later(void) static int __init hp_wmi_bios_2008_later(void)
{ {
int state = 0; int state = 0;
@ -438,7 +433,7 @@ static ssize_t show_als(struct device *dev, struct device_attribute *attr,
static ssize_t show_dock(struct device *dev, struct device_attribute *attr, static ssize_t show_dock(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int value = hp_wmi_dock_state(); int value = hp_wmi_hw_state(HPWMI_DOCK_MASK);
if (value < 0) if (value < 0)
return -EINVAL; return -EINVAL;
return sprintf(buf, "%d\n", value); return sprintf(buf, "%d\n", value);
@ -447,7 +442,7 @@ static ssize_t show_dock(struct device *dev, struct device_attribute *attr,
static ssize_t show_tablet(struct device *dev, struct device_attribute *attr, static ssize_t show_tablet(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int value = hp_wmi_tablet_state(); int value = hp_wmi_hw_state(HPWMI_TABLET_MASK);
if (value < 0) if (value < 0)
return -EINVAL; return -EINVAL;
return sprintf(buf, "%d\n", value); return sprintf(buf, "%d\n", value);
@ -550,10 +545,10 @@ static void hp_wmi_notify(u32 value, void *context)
case HPWMI_DOCK_EVENT: case HPWMI_DOCK_EVENT:
if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit)) if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit))
input_report_switch(hp_wmi_input_dev, SW_DOCK, input_report_switch(hp_wmi_input_dev, SW_DOCK,
hp_wmi_dock_state()); hp_wmi_hw_state(HPWMI_DOCK_MASK));
if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit)) if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit))
input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
hp_wmi_tablet_state()); hp_wmi_hw_state(HPWMI_TABLET_MASK));
input_sync(hp_wmi_input_dev); input_sync(hp_wmi_input_dev);
break; break;
case HPWMI_PARK_HDD: case HPWMI_PARK_HDD:
@ -631,14 +626,14 @@ static int __init hp_wmi_input_setup(void)
__set_bit(EV_SW, hp_wmi_input_dev->evbit); __set_bit(EV_SW, hp_wmi_input_dev->evbit);
/* Dock */ /* Dock */
val = hp_wmi_dock_state(); val = hp_wmi_hw_state(HPWMI_DOCK_MASK);
if (!(val < 0)) { if (!(val < 0)) {
__set_bit(SW_DOCK, hp_wmi_input_dev->swbit); __set_bit(SW_DOCK, hp_wmi_input_dev->swbit);
input_report_switch(hp_wmi_input_dev, SW_DOCK, val); input_report_switch(hp_wmi_input_dev, SW_DOCK, val);
} }
/* Tablet mode */ /* Tablet mode */
val = hp_wmi_tablet_state(); val = hp_wmi_hw_state(HPWMI_TABLET_MASK);
if (!(val < 0)) { if (!(val < 0)) {
__set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit); __set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit);
input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, val); input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, val);
@ -932,10 +927,10 @@ static int hp_wmi_resume_handler(struct device *device)
if (hp_wmi_input_dev) { if (hp_wmi_input_dev) {
if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit)) if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit))
input_report_switch(hp_wmi_input_dev, SW_DOCK, input_report_switch(hp_wmi_input_dev, SW_DOCK,
hp_wmi_dock_state()); hp_wmi_hw_state(HPWMI_DOCK_MASK));
if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit)) if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit))
input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
hp_wmi_tablet_state()); hp_wmi_hw_state(HPWMI_TABLET_MASK));
input_sync(hp_wmi_input_dev); input_sync(hp_wmi_input_dev);
} }