---

yaml --- r: 282355 b: refs/heads/master c: ce63920 h: refs/heads/master i: 282353: fe5af60 282351: e56c075 v: v3
git-mirror · Jan 8, 2012 · 20ab364 · 20ab364
1 parent 90541de
commit 20ab364
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3ca3839f344aa469e6f53c8bbb633e5ab9b96c8
+refs/heads/master: ce63920b395f1476e2d28cca16a56919289f0b62
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/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/trunk/include/linux/hid.h b/trunk/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