summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2011-12-02 21:57:50 -0800
committerJeremy Fitzhardinge <jeremy@goop.org>2012-01-08 18:31:18 +1100
commitce63920b395f1476e2d28cca16a56919289f0b62 (patch)
tree58105d4d6ee351b1e35df4ed027ba5deb3f07b96
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>
-rw-r--r--drivers/hid/hid-input.c8
-rw-r--r--include/linux/hid.h1
2 files changed, 0 insertions, 9 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
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;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 9351d3d1d089..0e76f0ca110a 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -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