Skip to content

Commit ef916ef

Browse files
ao2Jiri Kosina
authored andcommitted
HID: sony: fix some warnings from scripts/checkpatch.pl
WARNING: Block comments use a trailing */ on a separate line #822: FILE: drivers/hid/hid-sony.c:822: + * number but it's not needed for correct operation */ WARNING: Block comments use a trailing */ on a separate line #828: FILE: drivers/hid/hid-sony.c:828: + * buttons multiple keypresses are allowed */ WARNING: Block comments use a trailing */ on a separate line #854: FILE: drivers/hid/hid-sony.c:854: + * 0xff and 11th is for press indication */ WARNING: Missing a blank line after declarations #1930: FILE: drivers/hid/hid-sony.c:1930: + struct sony_sc *sc = container_of(work, struct sony_sc, state_worker); + sc->send_output_report(sc); WARNING: Block comments use a trailing */ on a separate line #2510: FILE: drivers/hid/hid-sony.c:2510: + * Logitech joystick from the device descriptor. */ Signed-off-by: Antonio Ospite <[email protected]> Acked-by: Frank Praznik <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 09593e3 commit ef916ef

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

drivers/hid/hid-sony.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -818,14 +818,18 @@ static __u8 ps3remote_rdesc[] = {
818818
/* Use collection 1 for joypad buttons */
819819
0xA1, 0x02, /* MCollection Logical (interrelated data) */
820820

821-
/* Ignore the 1st byte, maybe it is used for a controller
822-
* number but it's not needed for correct operation */
821+
/*
822+
* Ignore the 1st byte, maybe it is used for a controller
823+
* number but it's not needed for correct operation
824+
*/
823825
0x75, 0x08, /* GReportSize 0x08 [8] */
824826
0x95, 0x01, /* GReportCount 0x01 [1] */
825827
0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
826828

827-
/* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
828-
* buttons multiple keypresses are allowed */
829+
/*
830+
* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
831+
* buttons multiple keypresses are allowed
832+
*/
829833
0x05, 0x09, /* GUsagePage Button */
830834
0x19, 0x01, /* LUsageMinimum 0x01 [Button 1 (primary/trigger)] */
831835
0x29, 0x18, /* LUsageMaximum 0x18 [Button 24] */
@@ -850,8 +854,10 @@ static __u8 ps3remote_rdesc[] = {
850854
0x95, 0x01, /* GReportCount 0x01 [1] */
851855
0x80, /* MInput */
852856

853-
/* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
854-
* 0xff and 11th is for press indication */
857+
/*
858+
* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
859+
* 0xff and 11th is for press indication
860+
*/
855861
0x75, 0x08, /* GReportSize 0x08 [8] */
856862
0x95, 0x06, /* GReportCount 0x06 [6] */
857863
0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
@@ -1928,6 +1934,7 @@ static inline void sony_send_output_report(struct sony_sc *sc)
19281934
static void sony_state_worker(struct work_struct *work)
19291935
{
19301936
struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
1937+
19311938
sc->send_output_report(sc);
19321939
}
19331940

@@ -2507,8 +2514,10 @@ static const struct hid_device_id sony_devices[] = {
25072514
.driver_data = VAIO_RDESC_CONSTANT },
25082515
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE),
25092516
.driver_data = VAIO_RDESC_CONSTANT },
2510-
/* Wired Buzz Controller. Reported as Sony Hub from its USB ID and as
2511-
* Logitech joystick from the device descriptor. */
2517+
/*
2518+
* Wired Buzz Controller. Reported as Sony Hub from its USB ID and as
2519+
* Logitech joystick from the device descriptor.
2520+
*/
25122521
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER),
25132522
.driver_data = BUZZ_CONTROLLER },
25142523
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER),

0 commit comments

Comments
 (0)