Skip to content

Commit

Permalink
hid-input/battery: remove battery_val
Browse files Browse the repository at this point in the history
hidinput_get_battery_property() now directly polls the device for the
current battery strength, so there's no need for battery_val, or the
code to set it on the input event path.

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
  • Loading branch information
Jeremy Fitzhardinge committed Jan 8, 2012
1 parent b3ca383 commit ce63920
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
8 changes: 0 additions & 8 deletions drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -917,14 +917,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct

input = field->hidinput->input;

#ifdef CONFIG_HID_BATTERY_STRENGTH
if (usage->hid == HID_DC_BATTERYSTRENGTH) {
hid->battery_val = value;
hid_dbg(hid, "battery value is %d (range %d-%d)\n",
value, hid->battery_min, hid->battery_max);
return;
}
#endif
if (!usage->type)
return;

Expand Down
1 change: 0 additions & 1 deletion include/linux/hid.h
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,6 @@ struct hid_device { /* device report descriptor */
struct power_supply battery;
__s32 battery_min;
__s32 battery_max;
__s32 battery_val;
__s32 battery_report_type;
__s32 battery_report_id;
#endif
Expand Down

0 comments on commit ce63920

Please sign in to comment.