Commit 68c78d01 authored by Leo Sperling's avatar Leo Sperling Committed by Dmitry Torokhov

Input: xpad - fix some coding style issues

Fix some coding style issues reported by checkpatch.pl. Mostly brackets
in macros, spacing and comment style.
Signed-off-by: default avatarLeo Sperling <leosperling97@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d91abc21
...@@ -86,8 +86,10 @@ ...@@ -86,8 +86,10 @@
#define XPAD_PKT_LEN 64 #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_DPAD_TO_BUTTONS (1 << 0)
#define MAP_TRIGGERS_TO_BUTTONS (1 << 1) #define MAP_TRIGGERS_TO_BUTTONS (1 << 1)
#define MAP_STICKS_TO_NULL (1 << 2) #define MAP_STICKS_TO_NULL (1 << 2)
...@@ -386,15 +388,15 @@ static const signed short xpad_abs_triggers[] = { ...@@ -386,15 +388,15 @@ static const signed short xpad_abs_triggers[] = {
* match against vendor id as well. Wired Xbox 360 devices have protocol 1, * match against vendor id as well. Wired Xbox 360 devices have protocol 1,
* wireless controllers have protocol 129. * 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, \ .match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO, \
.idVendor = (vend), \ .idVendor = (vend), \
.bInterfaceClass = USB_CLASS_VENDOR_SPEC, \ .bInterfaceClass = USB_CLASS_VENDOR_SPEC, \
.bInterfaceSubClass = 93, \ .bInterfaceSubClass = 93, \
.bInterfaceProtocol = (pr) .bInterfaceProtocol = (pr)
#define XPAD_XBOX360_VENDOR(vend) \ #define XPAD_XBOX360_VENDOR(vend) \
{ XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \ { XPAD_XBOX360_VENDOR_PROTOCOL((vend), 1) }, \
{ XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) } { XPAD_XBOX360_VENDOR_PROTOCOL((vend), 129) }
/* The Xbox One controller uses subclass 71 and protocol 208. */ /* The Xbox One controller uses subclass 71 and protocol 208. */
#define XPAD_XBOXONE_VENDOR_PROTOCOL(vend, pr) \ #define XPAD_XBOXONE_VENDOR_PROTOCOL(vend, pr) \
...@@ -404,7 +406,7 @@ static const signed short xpad_abs_triggers[] = { ...@@ -404,7 +406,7 @@ static const signed short xpad_abs_triggers[] = {
.bInterfaceSubClass = 71, \ .bInterfaceSubClass = 71, \
.bInterfaceProtocol = (pr) .bInterfaceProtocol = (pr)
#define XPAD_XBOXONE_VENDOR(vend) \ #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[] = { static const struct usb_device_id xpad_table[] = {
{ USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */
...@@ -1568,6 +1570,7 @@ static void xpad_close(struct input_dev *dev) ...@@ -1568,6 +1570,7 @@ static void xpad_close(struct input_dev *dev)
static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs) static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs)
{ {
struct usb_xpad *xpad = input_get_drvdata(input_dev); struct usb_xpad *xpad = input_get_drvdata(input_dev);
set_bit(abs, input_dev->absbit); set_bit(abs, input_dev->absbit);
switch (abs) { switch (abs) {
......
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