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>

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index ceade58b8027e1b39ffbb6dbd12a1a2e1b623d00..48785db10e87a88f4892a16516b656aeec7e4f95 100644 (file)
--- 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 9351d3d1d0899798aaf7c10d98fa3cf6be62121f..0e76f0ca110a7606ce74c47efe6e5d545b43b66f 100644 (file)
--- 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