From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 7 Oct 2016 07:59:48 +0000 (+0200)
Subject: Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=179023e6af0c608ffb505821223f5580853ef6b8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for-4.9/intel-ish', 'for-4.9/kye-uclogic-waltop-fixes', 'for-4.9/logitech', 'for-4.9/sony', 'for-4.9/upstream' and 'for-4.9/wacom' into for-linus
---

179023e6af0c608ffb505821223f5580853ef6b8
diff --cc drivers/hid/wacom_wac.c
index 347e459dc113,1eae13cdc502,1eae13cdc502,1eae13cdc502,1eae13cdc502,1eae13cdc502,1eae13cdc502,1eae13cdc502,a48ed4ebd5a9..1cb79925730d
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@@@@@ -53,20 -53,20 -53,20 -53,20 -53,20 -53,20 -53,20 -53,20 -77,9 +77,9 @@@@@@@@@@ static void wacom_notify_battery(struc
         	bool ps_connected)
         {
         	struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac);
-------- 	bool changed = wacom_wac->battery_capacity != bat_capacity  ||
-------- 		       wacom_wac->bat_charging     != bat_charging  ||
-------- 		       wacom_wac->bat_connected    != bat_connected ||
-------- 		       wacom_wac->ps_connected     != ps_connected;
-        
-        	if (changed) {
-        		wacom_wac->battery_capacity = bat_capacity;
-        		wacom_wac->bat_charging = bat_charging;
-        		wacom_wac->bat_connected = bat_connected;
-        		wacom_wac->ps_connected = ps_connected;
         
 ------- 	if (changed) {
 ------- 		wacom_wac->battery_capacity = bat_capacity;
 ------- 		wacom_wac->bat_charging = bat_charging;
 ------- 		wacom_wac->bat_connected = bat_connected;
 ------- 		wacom_wac->ps_connected = ps_connected;
 ------- 
-------- 		if (wacom->battery)
-------- 			power_supply_changed(wacom->battery);
-------- 	}
++++++++ 	__wacom_notify_battery(&wacom->battery, bat_capacity, bat_charging,
++++++++ 			       bat_connected, ps_connected);
         }
         
         static int wacom_penpartner_irq(struct wacom_wac *wacom)
@@@@@@@@@@ -807,24 -807,24 -807,24 -807,24 -807,24 -807,24 -807,24 -807,24 -837,19 +837,19 @@@@@@@@@@ static int wacom_remote_irq(struct waco
         	touch_ring_mode = (data[11] & 0xC0) >> 6;
         
         	for (i = 0; i < WACOM_MAX_REMOTES; i++) {
-------- 		if (wacom_wac->serial[i] == serial)
-------- 			wacom->led.select[i] = touch_ring_mode;
 ------- 	}
 ------- 
 ------- 	if (!wacom->battery &&
 ------- 	    !(features->quirks & WACOM_QUIRK_BATTERY)) {
 ------- 		features->quirks |= WACOM_QUIRK_BATTERY;
 ------- 		INIT_WORK(&wacom->work, wacom_battery_work);
 ------- 		wacom_schedule_work(wacom_wac);
++++++++ 		if (remote->remotes[i].serial == serial)
++++++++ 			wacom->led.groups[i].select = touch_ring_mode;
         	}
         
-        	if (!wacom->battery &&
-        	    !(features->quirks & WACOM_QUIRK_BATTERY)) {
-        		features->quirks |= WACOM_QUIRK_BATTERY;
-        		INIT_WORK(&wacom->work, wacom_battery_work);
-        		wacom_schedule_work(wacom_wac);
-        	}
 ------- 	wacom_notify_battery(wacom_wac, bat_percent, bat_charging, 1,
 ------- 			     bat_charging);
++++++++ 	__wacom_notify_battery(&remote->remotes[index].battery, bat_percent,
++++++++ 				bat_charging, 1, bat_charging);
         
-        	wacom_notify_battery(wacom_wac, bat_percent, bat_charging, 1,
-        			     bat_charging);
-        
-------- 	return 1;
++++++++ out:
++++++++ 	spin_unlock_irqrestore(&remote->remote_lock, flags);
++++++++ 	return 0;
         }
         
-------- static int wacom_remote_status_irq(struct wacom_wac *wacom_wac, size_t len)
++++++++ static void wacom_remote_status_irq(struct wacom_wac *wacom_wac, size_t len)
         {
         	struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac);
         	unsigned char *data = wacom_wac->data;