aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2011-12-03 00:57:50 -0500
committerJeremy Fitzhardinge <jeremy@goop.org>2012-01-08 02:31:18 -0500
commitce63920b395f1476e2d28cca16a56919289f0b62 (patch)
tree58105d4d6ee351b1e35df4ed027ba5deb3f07b96 /drivers/hid/hid-input.c
parentb3ca3839f344aa469e6f53c8bbb633e5ab9b96c8 (diff)
hid-input/battery: remove battery_val
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>
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index ceade58b8027..48785db10e87 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -917,14 +917,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
917 917
918 input = field->hidinput->input; 918 input = field->hidinput->input;
919 919
920#ifdef CONFIG_HID_BATTERY_STRENGTH
921 if (usage->hid == HID_DC_BATTERYSTRENGTH) {
922 hid->battery_val = value;
923 hid_dbg(hid, "battery value is %d (range %d-%d)\n",
924 value, hid->battery_min, hid->battery_max);
925 return;
926 }
927#endif
928 if (!usage->type) 920 if (!usage->type)
929 return; 921 return;
930 922