HID: wacom: remove unnecessary 'connected' variable from EKR

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 <skomra@gmail.com>
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index eb833455abd5014ea5d614d25dd88ad15f117e90..16862f97c46c1e9c50a26d524bd9ee4f75a5bbde 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -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)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 6c056f8844e7086a99cea3a8c592f84c91430536..c922c1c4c78f09ba882d9cd6d1a5ad232f5b2a9d 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -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);

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 2e7cc5e7a0cb7fb6ac219ebe93ca56db2503cea6..a10b1966994737c31b3b327c9cbcb04934941ba1 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -331,7 +331,6 @@ struct hid_data {
 struct wacom_remote_data {
        struct {
                u32 serial;
-               bool connected;
        } remote[WACOM_MAX_REMOTES];
 };