HID: wacom: remove unnecessary 'connected' variable from EKR
Subsystems (2)
PATCH 2/3 HID: wacom: remove unnecessary 'connected' variable from EKR
From: Aaron Armstrong Skomra <[email protected]>
The 'connected' variable was poorly named, and this has led to some confusion. We can get the same information by checking if a serial number exists in the specified EKR slot.
Signed-off-by Aaron Skomra <[email protected]>
Signed-off-by Aaron Armstrong Skomra <[email protected]>
Reviewed-by Jason Gerecke <[email protected]>
--- drivers/hid/wacom_sys.c | 2 +- drivers/hid/wacom_wac.c | 2 -- drivers/hid/wacom_wac.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/hid/wacom_sys.c +1 -1
@@ -2684,7 +2684,7 @@ static void wacom_remote_work(struct work_struct *work)for (i =0 ; i <WACOM_MAX_REMOTES ; i++) { serial = data.remote[i].serial; -if (data.remote[i].connected) { +if (serial) {if (kt - remote->remotes[i].active_time >WACOM_REMOTE_BATTERY_TIMEOUT && remote->remotes[i].active_time !=0 )
drivers/hid/wacom_wac.c +0 -2
@@ -1209,10 +1209,8 @@ static void wacom_remote_status_irq(struct wacom_wac *wacom_wac, size_t len)for (i =0 ; i <WACOM_MAX_REMOTES ; i++) {int j = i *6 ;int serial = (data[j+6 ] <<16 ) + (data[j+5 ] <<8 ) + data[j+4 ]; -bool connected = data[j+2 ]; remote_data.remote[i].serial = serial; - remote_data.remote[i].connected = connected; }spin_lock_irqsave (&remote->remote_lock, flags);
drivers/hid/wacom_wac.h +0 -1
@@ -331,7 +331,6 @@ struct hid_data {struct wacom_remote_data {struct {u32 serial; -bool connected; } remote[WACOM_MAX_REMOTES ]; };
Signature · 1 line
2.34.1