Input: iforce - use unaligned accessors, where appropriate

Instead of open-coding conversion from/to little-endian, let's
use proper accessors.

Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2018-08-10 13:54:02 -07:00
parent 8624dfd10a
commit 21ae38f855
2 changed files with 12 additions and 7 deletions

View File

@ -21,6 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <asm/unaligned.h>
#include "iforce.h"
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>, Johann Deneux <johann.deneux@gmail.com>");
@ -286,17 +287,17 @@ int iforce_init_device(struct device *parent, u16 bustype,
*/
if (!iforce_get_id_packet(iforce, 'M', buf, &len) || len < 3)
input_dev->id.vendor = (buf[2] << 8) | buf[1];
input_dev->id.vendor = get_unaligned_le16(buf + 1);
else
dev_warn(&iforce->dev->dev, "Device does not respond to id packet M\n");
if (!iforce_get_id_packet(iforce, 'P', buf, &len) || len < 3)
input_dev->id.product = (buf[2] << 8) | buf[1];
input_dev->id.product = get_unaligned_le16(buf + 1);
else
dev_warn(&iforce->dev->dev, "Device does not respond to id packet P\n");
if (!iforce_get_id_packet(iforce, 'B', buf, &len) || len < 3)
iforce->device_memory.end = (buf[2] << 8) | buf[1];
iforce->device_memory.end = get_unaligned_le16(buf + 1);
else
dev_warn(&iforce->dev->dev, "Device does not respond to id packet B\n");

View File

@ -21,6 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <asm/unaligned.h>
#include "iforce.h"
static struct {
@ -175,8 +176,10 @@ void iforce_process_packet(struct iforce *iforce,
switch (packet_id) {
case 0x01: /* joystick position data */
input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0]));
input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2]));
input_report_abs(dev, ABS_X,
(__s16) get_unaligned_le16(data));
input_report_abs(dev, ABS_Y,
(__s16) get_unaligned_le16(data + 2));
input_report_abs(dev, ABS_THROTTLE, 255 - data[4]);
if (len >= 8 && test_bit(ABS_RUDDER ,dev->absbit))
@ -188,7 +191,8 @@ void iforce_process_packet(struct iforce *iforce,
break;
case 0x03: /* wheel position data */
input_report_abs(dev, ABS_WHEEL, (__s16) (((__s16)data[1] << 8) | data[0]));
input_report_abs(dev, ABS_WHEEL,
(__s16) get_unaligned_le16(data));
input_report_abs(dev, ABS_GAS, 255 - data[2]);
input_report_abs(dev, ABS_BRAKE, 255 - data[3]);
@ -214,7 +218,7 @@ void iforce_process_packet(struct iforce *iforce,
}
for (j = 3; j < len; j += 2)
mark_core_as_ready(iforce, data[j] | (data[j + 1] << 8));
mark_core_as_ready(iforce, get_unaligned_le16(data + j));
break;
}