| From ed646a0a6a1013a53db2e2c04f804c25f108da1e Mon Sep 17 00:00:00 2001 |
| From: Leo Sperling <leosperling97@gmail.com> |
| Date: Wed, 3 Aug 2016 17:31:09 -0700 |
| Subject: Input: xpad - fix some coding style issues |
| |
| [ Upstream commit 68c78d0155e37992268664e134996d2b140ddf38 ] |
| |
| Fix some coding style issues reported by checkpatch.pl. Mostly brackets |
| in macros, spacing and comment style. |
| |
| Signed-off-by: Leo Sperling <leosperling97@gmail.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 15 +++++++++------ |
| 1 file changed, 9 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index 298581b0f6c1..b6e172f22c16 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -89,8 +89,10 @@ |
| |
| #define XPAD_PKT_LEN 64 |
| |
| -/* xbox d-pads should map to buttons, as is required for DDR pads |
| - but we map them to axes when possible to simplify things */ |
| +/* |
| + * xbox d-pads should map to buttons, as is required for DDR pads |
| + * but we map them to axes when possible to simplify things |
| + */ |
| #define MAP_DPAD_TO_BUTTONS (1 << 0) |
| #define MAP_TRIGGERS_TO_BUTTONS (1 << 1) |
| #define MAP_STICKS_TO_NULL (1 << 2) |
| @@ -390,15 +392,15 @@ static const signed short xpad_abs_triggers[] = { |
| * match against vendor id as well. Wired Xbox 360 devices have protocol 1, |
| * wireless controllers have protocol 129. |
| */ |
| -#define XPAD_XBOX360_VENDOR_PROTOCOL(vend,pr) \ |
| +#define XPAD_XBOX360_VENDOR_PROTOCOL(vend, pr) \ |
| .match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO, \ |
| .idVendor = (vend), \ |
| .bInterfaceClass = USB_CLASS_VENDOR_SPEC, \ |
| .bInterfaceSubClass = 93, \ |
| .bInterfaceProtocol = (pr) |
| #define XPAD_XBOX360_VENDOR(vend) \ |
| - { XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \ |
| - { XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) } |
| + { XPAD_XBOX360_VENDOR_PROTOCOL((vend), 1) }, \ |
| + { XPAD_XBOX360_VENDOR_PROTOCOL((vend), 129) } |
| |
| /* The Xbox One controller uses subclass 71 and protocol 208. */ |
| #define XPAD_XBOXONE_VENDOR_PROTOCOL(vend, pr) \ |
| @@ -408,7 +410,7 @@ static const signed short xpad_abs_triggers[] = { |
| .bInterfaceSubClass = 71, \ |
| .bInterfaceProtocol = (pr) |
| #define XPAD_XBOXONE_VENDOR(vend) \ |
| - { XPAD_XBOXONE_VENDOR_PROTOCOL(vend, 208) } |
| + { XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) } |
| |
| static const struct usb_device_id xpad_table[] = { |
| { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ |
| @@ -1576,6 +1578,7 @@ static void xpad_close(struct input_dev *dev) |
| static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs) |
| { |
| struct usb_xpad *xpad = input_get_drvdata(input_dev); |
| + |
| set_bit(abs, input_dev->absbit); |
| |
| switch (abs) { |
| -- |
| 2.17.1 |
| |