Commit 83b6549e authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: zforce_ts - switch to using get_unaligned_le16

Instead of doing conversion from little-endian data to CPU endianness
by hand use existing helpers.

Tested-by: Andreas Kemnade <andreas@kemnade.info> # Tolino Shine2HD
Link: https://lore.kernel.org/r/20240824055047.1706392-10-dmitry.torokhov@gmail.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5c200267
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/property.h> #include <linux/property.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/unaligned.h>
#define WAIT_TIMEOUT msecs_to_jiffies(1000) #define WAIT_TIMEOUT msecs_to_jiffies(1000)
...@@ -327,10 +328,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload) ...@@ -327,10 +328,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload)
} }
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
point.coord_x = point.coord_x = get_unaligned_le16(&payload[9 * i + 1]);
payload[9 * i + 2] << 8 | payload[9 * i + 1]; point.coord_y = get_unaligned_le16(&payload[9 * i + 3]);
point.coord_y =
payload[9 * i + 4] << 8 | payload[9 * i + 3];
if (point.coord_x > ts->prop.max_x || if (point.coord_x > ts->prop.max_x ||
point.coord_y > ts->prop.max_y) { point.coord_y > ts->prop.max_y) {
...@@ -521,14 +520,15 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id) ...@@ -521,14 +520,15 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
* Version Payload Results * Version Payload Results
* [2:major] [2:minor] [2:build] [2:rev] * [2:major] [2:minor] [2:build] [2:rev]
*/ */
ts->version_major = (payload[RESPONSE_DATA + 1] << 8) | ts->version_major =
payload[RESPONSE_DATA]; get_unaligned_le16(&payload[RESPONSE_DATA]);
ts->version_minor = (payload[RESPONSE_DATA + 3] << 8) | ts->version_minor =
payload[RESPONSE_DATA + 2]; get_unaligned_le16(&payload[RESPONSE_DATA + 2]);
ts->version_build = (payload[RESPONSE_DATA + 5] << 8) | ts->version_build =
payload[RESPONSE_DATA + 4]; get_unaligned_le16(&payload[RESPONSE_DATA + 4]);
ts->version_rev = (payload[RESPONSE_DATA + 7] << 8) | ts->version_rev =
payload[RESPONSE_DATA + 6]; get_unaligned_le16(&payload[RESPONSE_DATA + 6]);
dev_dbg(&ts->client->dev, dev_dbg(&ts->client->dev,
"Firmware Version %04x:%04x %04x:%04x\n", "Firmware Version %04x:%04x %04x:%04x\n",
ts->version_major, ts->version_minor, ts->version_major, ts->version_minor,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment