diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-07-13 19:06:08 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-08-05 14:39:18 +0300 |
| commit | 59d69bc8215478af6b89d4ae9ab0baf6d91eb870 (patch) | |
| tree | 704ecbae967c3914376213d83376d17fcd96979f /drivers/hid/wacom_wac.h | |
| parent | 7c35dc3cd4d114019ed4b26cab313e253396d7c9 (diff) | |
| download | linux-59d69bc8215478af6b89d4ae9ab0baf6d91eb870.tar.xz | |
HID: wacom: EKR: have one power_supply per remote
Previously, all the remotes attached to the same receiver would share the
same power_supply. That's not good as the remotes will constantly change
the battery information according to their own state.
To have something generic enough, we introduce struct wacom_battery
which regroups all the information we need for a battery.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 6be6cae0d093..8a8974c901cb 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -229,8 +229,6 @@ struct wacom_wac { char pen_name[WACOM_NAME_MAX]; char touch_name[WACOM_NAME_MAX]; char pad_name[WACOM_NAME_MAX]; - char bat_name[WACOM_NAME_MAX]; - char ac_name[WACOM_NAME_MAX]; unsigned char data[WACOM_PKGLEN_MAX]; int tool[2]; int id[2]; @@ -242,11 +240,7 @@ struct wacom_wac { struct input_dev *touch_input; struct input_dev *pad_input; int pid; - int battery_capacity; int num_contacts_left; - int bat_charging; - int bat_connected; - int ps_connected; u8 bt_features; u8 bt_high_speed; int mode_report; |