From: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
No functional changes, just a prep patch for the one after.
Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
Acked-by: Ping Cheng <pi...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[aaron.sko...@wacom.com: Imported into input-wacom repository (e7749f6)]
Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
[aaron.sko...@wacom.com: Backported from input-wacom repository (6f2fab8)]
Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
---
2.6.38/wacom.h | 6 ++++--
2.6.38/wacom_sys.c | 57 +++++++++++++++++++++++++++---------------------------
2.6.38/wacom_wac.c | 2 +-
3.17/wacom.h | 6 ++++--
3.17/wacom_sys.c | 53 +++++++++++++++++++++++++-------------------------
3.17/wacom_wac.c | 2 +-
3.7/wacom.h | 6 ++++--
3.7/wacom_sys.c | 57 +++++++++++++++++++++++++++---------------------------
3.7/wacom_wac.c | 2 +-
9 files changed, 100 insertions(+), 91 deletions(-)
diff --git a/2.6.38/wacom.h b/2.6.38/wacom.h
index e0c7be1..5ecd3b8 100644
--- a/2.6.38/wacom.h
+++ b/2.6.38/wacom.h
@@ -123,8 +123,10 @@ struct wacom_remote {
spinlock_t remote_lock;
struct kfifo remote_fifo;
struct kobject *remote_dir;
- struct attribute_group remote_group[WACOM_MAX_REMOTES];
- __u32 serial[WACOM_MAX_REMOTES];
+ struct {
+ struct attribute_group group;
+ u32 serial;
+ } remotes[WACOM_MAX_REMOTES];
};
struct wacom {
diff --git a/2.6.38/wacom_sys.c b/2.6.38/wacom_sys.c
index 5ce0210..41f8b9a 100644
--- a/2.6.38/wacom_sys.c
+++ b/2.6.38/wacom_sys.c
@@ -1285,15 +1285,15 @@ static int wacom_remote_create_attr_group(struct wacom
*wacom, __u32 serial, int
int error = 0;
struct wacom_remote *remote = wacom->remote;
- remote->remote_group[index].name = kasprintf(GFP_KERNEL, "%d", serial);
- if (!remote->remote_group[index].name)
+ remote->remotes[index].group.name = kasprintf(GFP_KERNEL, "%d", serial);
+ if (!remote->remotes[index].group.name)
return -ENOMEM;
error = __wacom_devm_sysfs_create_group(wacom, remote->remote_dir,
- &remote->remote_group[index]);
+ &remote->remotes[index].group);
if (error) {
- remote->remote_group[index].name = NULL;
+ remote->remotes[index].group.name = NULL;
dev_err(&wacom->intf->dev,
"cannot create sysfs group err: %d\n", error);
return error;
@@ -1326,21 +1326,22 @@ static int wacom_cmd_unpair_remote(struct wacom *wacom,
unsigned char selector)
static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
{
struct wacom_remote *remote = wacom->remote;
- u32 serial = remote->serial[index];
+ u32 serial = remote->remotes[index].serial;
int i;
- if (remote->remote_group[index].name)
- devres_release_group(&wacom->usbdev->dev,
&remote->serial[index]);
+ if (remote->remotes[index].group.name)
+ devres_release_group(&wacom->usbdev->dev,
+ &remote->remotes[index]);
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial) {
- remote->serial[i] = 0;
+ if (remote->remotes[i].serial == serial) {
+ remote->remotes[i].serial = 0;
/* Destroy the attribute group parts not
* covered by devres for this kernel.
*/
- kfree((char *)remote->remote_group[i].name);
- remote->remote_group[i].name = NULL;
+ kfree((char *)remote->remotes[i].group.name);
+ remote->remotes[i].group.name = NULL;
wacom->led.select[i] = WACOM_STATUS_UNKNOWN;
}
@@ -1358,31 +1359,31 @@ static int wacom_remote_create_one(struct wacom *wacom,
u32 serial,
* check to make sure this serial isn't already paired.
*/
for (k = 0; k < WACOM_MAX_REMOTES; k++) {
- if (remote->serial[k] == serial)
+ if (remote->remotes[k].serial == serial)
break;
}
if (k < WACOM_MAX_REMOTES) {
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
return 0;
}
- if (!devres_open_group(dev, &remote->serial[index], GFP_KERNEL))
+ if (!devres_open_group(dev, &remote->remotes[index], GFP_KERNEL))
return -ENOMEM;
error = wacom_remote_create_attr_group(wacom, serial, index);
if (error)
goto fail;
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
- devres_close_group(dev, &remote->serial[index]);
+ devres_close_group(dev, &remote->remotes[index]);
return 0;
fail:
- devres_release_group(dev, &remote->serial[index]);
- remote->serial[index] = 0;
+ devres_release_group(dev, &remote->remotes[index]);
+ remote->remotes[index].serial = 0;
return error;
}
@@ -1431,7 +1432,7 @@ static void wacom_remotes_destroy(void *data)
return;
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (wacom->remote->remote_group[i].name) {
+ if (wacom->remote->remotes[i].group.name) {
wacom_remote_destroy_one(wacom, i);
}
}
@@ -1466,11 +1467,11 @@ static int wacom_initialize_remotes(struct wacom *wacom)
return -ENOMEM;
}
- remote->remote_group[0] = remote0_serial_group;
- remote->remote_group[1] = remote1_serial_group;
- remote->remote_group[2] = remote2_serial_group;
- remote->remote_group[3] = remote3_serial_group;
- remote->remote_group[4] = remote4_serial_group;
+ remote->remotes[0].group = remote0_serial_group;
+ remote->remotes[1].group = remote1_serial_group;
+ remote->remotes[2].group = remote2_serial_group;
+ remote->remotes[3].group = remote3_serial_group;
+ remote->remotes[4].group = remote4_serial_group;
remote->remote_dir = kobject_create_and_add("wacom_remote",
&wacom->intf->dev.kobj);
@@ -1488,7 +1489,7 @@ static int wacom_initialize_remotes(struct wacom *wacom)
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
wacom->led.select[i] = WACOM_STATUS_UNKNOWN;
- remote->serial[i] = 0;
+ remote->remotes[i].serial = 0;
}
return 0;
@@ -1727,15 +1728,15 @@ static void wacom_remote_work(struct work_struct *work)
serial = data.remote[i].serial;
if (data.remote[i].connected) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
continue;
- if (remote->serial[i])
+ if (remote->remotes[i].serial)
wacom_remote_destroy_one(wacom, i);
wacom_remote_create_one(wacom, serial, i);
- } else if (remote->serial[i]) {
+ } else if (remote->remotes[i].serial) {
wacom_remote_destroy_one(wacom, i);
}
}
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 7ccd5bc..4f369e8 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -756,7 +756,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac,
size_t len)
touch_ring_mode = (data[11] & 0xC0) >> 6;
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
wacom->led.select[i] = touch_ring_mode;
}
diff --git a/3.17/wacom.h b/3.17/wacom.h
index d2c9548..1dd9cce 100644
--- a/3.17/wacom.h
+++ b/3.17/wacom.h
@@ -134,8 +134,10 @@ struct wacom_remote {
spinlock_t remote_lock;
struct kfifo remote_fifo;
struct kobject *remote_dir;
- struct attribute_group remote_group[WACOM_MAX_REMOTES];
- __u32 serial[WACOM_MAX_REMOTES];
+ struct {
+ struct attribute_group group;
+ u32 serial;
+ } remotes[WACOM_MAX_REMOTES];
};
struct wacom {
diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c
index 3b2c71c..4c5b075 100644
--- a/3.17/wacom_sys.c
+++ b/3.17/wacom_sys.c
@@ -1360,16 +1360,16 @@ static int wacom_remote_create_attr_group(struct wacom
*wacom, __u32 serial,
int error = 0;
struct wacom_remote *remote = wacom->remote;
- remote->remote_group[index].name = devm_kasprintf(&wacom->hdev->dev,
+ remote->remotes[index].group.name = devm_kasprintf(&wacom->hdev->dev,
GFP_KERNEL,
"%d", serial);
- if (!remote->remote_group[index].name)
+ if (!remote->remotes[index].group.name)
return -ENOMEM;
error = __wacom_devm_sysfs_create_group(wacom, remote->remote_dir,
- &remote->remote_group[index]);
+ &remote->remotes[index].group);
if (error) {
- remote->remote_group[index].name = NULL;
+ remote->remotes[index].group.name = NULL;
hid_err(wacom->hdev,
"cannot create sysfs group err: %d\n", error);
return error;
@@ -1473,11 +1473,11 @@ static int wacom_initialize_remotes(struct wacom *wacom)
return -ENOMEM;
}
- remote->remote_group[0] = remote0_serial_group;
- remote->remote_group[1] = remote1_serial_group;
- remote->remote_group[2] = remote2_serial_group;
- remote->remote_group[3] = remote3_serial_group;
- remote->remote_group[4] = remote4_serial_group;
+ remote->remotes[0].group = remote0_serial_group;
+ remote->remotes[1].group = remote1_serial_group;
+ remote->remotes[2].group = remote2_serial_group;
+ remote->remotes[3].group = remote3_serial_group;
+ remote->remotes[4].group = remote4_serial_group;
remote->remote_dir = kobject_create_and_add("wacom_remote",
&wacom->hdev->dev.kobj);
@@ -1494,7 +1494,7 @@ static int wacom_initialize_remotes(struct wacom *wacom)
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN;
- remote->serial[i] = 0;
+ remote->remotes[i].serial = 0;
}
error = devm_add_action_or_reset(&wacom->hdev->dev,
@@ -1974,16 +1974,17 @@ fail:
static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
{
struct wacom_remote *remote = wacom->remote;
- u32 serial = remote->serial[index];
+ u32 serial = remote->remotes[index].serial;
int i;
- if (remote->remote_group[index].name)
- devres_release_group(&wacom->hdev->dev, &remote->serial[index]);
+ if (remote->remotes[index].group.name)
+ devres_release_group(&wacom->hdev->dev,
+ &remote->remotes[index]);
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial) {
- remote->serial[i] = 0;
- remote->remote_group[i].name = NULL;
+ if (remote->remotes[i].serial == serial) {
+ remote->remotes[i].serial = 0;
+ remote->remotes[i].group.name = NULL;
wacom->led.groups[i].select = WACOM_STATUS_UNKNOWN;
}
}
@@ -2000,30 +2001,30 @@ static int wacom_remote_create_one(struct wacom *wacom,
u32 serial,
* check to make sure this serial isn't already paired.
*/
for (k = 0; k < WACOM_MAX_REMOTES; k++) {
- if (remote->serial[k] == serial)
+ if (remote->remotes[k].serial == serial)
break;
}
if (k < WACOM_MAX_REMOTES) {
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
return 0;
}
- if (!devres_open_group(dev, &remote->serial[index], GFP_KERNEL))
+ if (!devres_open_group(dev, &remote->remotes[index], GFP_KERNEL))
return -ENOMEM;
error = wacom_remote_create_attr_group(wacom, serial, index);
if (error)
goto fail;
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
- devres_close_group(dev, &remote->serial[index]);
+ devres_close_group(dev, &remote->remotes[index]);
return 0;
fail:
- devres_release_group(dev, &remote->serial[index]);
- remote->serial[index] = 0;
+ devres_release_group(dev, &remote->remotes[index]);
+ remote->remotes[index].serial = 0;
return error;
}
@@ -2057,15 +2058,15 @@ static void wacom_remote_work(struct work_struct *work)
serial = data.remote[i].serial;
if (data.remote[i].connected) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
continue;
- if (remote->serial[i])
+ if (remote->remotes[i].serial)
wacom_remote_destroy_one(wacom, i);
wacom_remote_create_one(wacom, serial, i);
- } else if (remote->serial[i]) {
+ } else if (remote->remotes[i].serial) {
wacom_remote_destroy_one(wacom, i);
}
}
diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
index 7ab1553..96ced4e 100644
--- a/3.17/wacom_wac.c
+++ b/3.17/wacom_wac.c
@@ -814,7 +814,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac,
size_t len)
touch_ring_mode = (data[11] & 0xC0) >> 6;
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
wacom->led.groups[i].select = touch_ring_mode;
}
diff --git a/3.7/wacom.h b/3.7/wacom.h
index 2067a5c..492b09a 100644
--- a/3.7/wacom.h
+++ b/3.7/wacom.h
@@ -119,8 +119,10 @@ struct wacom_remote {
spinlock_t remote_lock;
struct kfifo remote_fifo;
struct kobject *remote_dir;
- struct attribute_group remote_group[WACOM_MAX_REMOTES];
- __u32 serial[WACOM_MAX_REMOTES];
+ struct {
+ struct attribute_group group;
+ u32 serial;
+ } remotes[WACOM_MAX_REMOTES];
};
struct wacom {
diff --git a/3.7/wacom_sys.c b/3.7/wacom_sys.c
index ef241c9..e899cb2 100644
--- a/3.7/wacom_sys.c
+++ b/3.7/wacom_sys.c
@@ -1278,14 +1278,14 @@ static int wacom_remote_create_attr_group(struct wacom
*wacom, __u32 serial, int
int error = 0;
struct wacom_remote *remote = wacom->remote;
- remote->remote_group[index].name = kasprintf(GFP_KERNEL, "%d", serial);
- if (!remote->remote_group[index].name)
+ remote->remotes[index].group.name = kasprintf(GFP_KERNEL, "%d", serial);
+ if (!remote->remotes[index].group.name)
return -ENOMEM;
error = __wacom_devm_sysfs_create_group(wacom, remote->remote_dir,
- &remote->remote_group[index]);
+ &remote->remotes[index].group);
if (error) {
- remote->remote_group[index].name = NULL;
+ remote->remotes[index].group.name = NULL;
dev_err(&wacom->intf->dev,
"cannot create sysfs group err: %d\n", error);
return error;
@@ -1318,21 +1318,22 @@ static int wacom_cmd_unpair_remote(struct wacom *wacom,
unsigned char selector)
static void wacom_remote_destroy_one(struct wacom *wacom, unsigned int index)
{
struct wacom_remote *remote = wacom->remote;
- u32 serial = remote->serial[index];
+ u32 serial = remote->remotes[index].serial;
int i;
- if (remote->remote_group[index].name)
- devres_release_group(&wacom->usbdev->dev,
&remote->serial[index]);
+ if (remote->remotes[index].group.name)
+ devres_release_group(&wacom->usbdev->dev,
+ &remote->remotes[index]);
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial) {
- remote->serial[i] = 0;
+ if (remote->remotes[i].serial == serial) {
+ remote->remotes[i].serial = 0;
/* Destroy the attribute group parts not
* covered by devres for this kernel.
*/
- kfree((char *)remote->remote_group[i].name);
- remote->remote_group[i].name = NULL;
+ kfree((char *)remote->remotes[i].group.name);
+ remote->remotes[i].group.name = NULL;
wacom->led.select[i] = WACOM_STATUS_UNKNOWN;
}
@@ -1350,31 +1351,31 @@ static int wacom_remote_create_one(struct wacom *wacom,
u32 serial,
* check to make sure this serial isn't already paired.
*/
for (k = 0; k < WACOM_MAX_REMOTES; k++) {
- if (remote->serial[k] == serial)
+ if (remote->remotes[k].serial == serial)
break;
}
if (k < WACOM_MAX_REMOTES) {
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
return 0;
}
- if (!devres_open_group(dev, &remote->serial[index], GFP_KERNEL))
+ if (!devres_open_group(dev, &remote->remotes[index], GFP_KERNEL))
return -ENOMEM;
error = wacom_remote_create_attr_group(wacom, serial, index);
if (error)
goto fail;
- remote->serial[index] = serial;
+ remote->remotes[index].serial = serial;
- devres_close_group(dev, &remote->serial[index]);
+ devres_close_group(dev, &remote->remotes[index]);
return 0;
fail:
- devres_release_group(dev, &remote->serial[index]);
- remote->serial[index] = 0;
+ devres_release_group(dev, &remote->remotes[index]);
+ remote->remotes[index].serial = 0;
return error;
}
@@ -1422,7 +1423,7 @@ static void wacom_remotes_destroy(struct wacom *wacom)
return;
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (wacom->remote->remote_group[i].name) {
+ if (wacom->remote->remotes[i].group.name) {
wacom_remote_destroy_one(wacom, i);
}
}
@@ -1457,11 +1458,11 @@ static int wacom_initialize_remotes(struct wacom *wacom)
return -ENOMEM;
}
- remote->remote_group[0] = remote0_serial_group;
- remote->remote_group[1] = remote1_serial_group;
- remote->remote_group[2] = remote2_serial_group;
- remote->remote_group[3] = remote3_serial_group;
- remote->remote_group[4] = remote4_serial_group;
+ remote->remotes[0].group = remote0_serial_group;
+ remote->remotes[1].group = remote1_serial_group;
+ remote->remotes[2].group = remote2_serial_group;
+ remote->remotes[3].group = remote3_serial_group;
+ remote->remotes[4].group = remote4_serial_group;
remote->remote_dir = kobject_create_and_add("wacom_remote",
&wacom->intf->dev.kobj);
@@ -1479,7 +1480,7 @@ static int wacom_initialize_remotes(struct wacom *wacom)
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
wacom->led.select[i] = WACOM_STATUS_UNKNOWN;
- remote->serial[i] = 0;
+ remote->remotes[i].serial = 0;
}
return 0;
@@ -1721,15 +1722,15 @@ static void wacom_remote_work(struct work_struct *work)
serial = data.remote[i].serial;
if (data.remote[i].connected) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
continue;
- if (remote->serial[i])
+ if (remote->remotes[i].serial)
wacom_remote_destroy_one(wacom, i);
wacom_remote_create_one(wacom, serial, i);
- } else if (remote->serial[i]) {
+ } else if (remote->remotes[i].serial) {
wacom_remote_destroy_one(wacom, i);
}
}
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index bd6c32a..8aa77c8 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -757,7 +757,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac,
size_t len)
touch_ring_mode = (data[11] & 0xC0) >> 6;
for (i = 0; i < WACOM_MAX_REMOTES; i++) {
- if (remote->serial[i] == serial)
+ if (remote->remotes[i].serial == serial)
wacom->led.select[i] = touch_ring_mode;
}
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
