Skip to content

Commit

Permalink
HID: sony: Coding style cleanups in sixaxis_set_operational_usb()
Browse files Browse the repository at this point in the history
Don't mix declaration and allocation, remove some useless newlines
between calling a function and checking its return value.

Signed-off-by: Antonio Ospite <[email protected]>
Acked-by: Frank Praznik <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
  • Loading branch information
ao2 authored and Jiri Kosina committed Feb 18, 2015
1 parent dad89ad commit 2e701a3
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/hid/hid-sony.c
Original file line number Diff line number Diff line change
Expand Up @@ -1131,17 +1131,17 @@ static void sony_input_configured(struct hid_device *hdev,
*/
static int sixaxis_set_operational_usb(struct hid_device *hdev)
{
int ret;
const int buf_size =
max(SIXAXIS_REPORT_0xF2_SIZE, SIXAXIS_REPORT_0xF5_SIZE);
__u8 *buf = kmalloc(buf_size, GFP_KERNEL);
__u8 *buf;
int ret;

buf = kmalloc(buf_size, GFP_KERNEL);
if (!buf)
return -ENOMEM;

ret = hid_hw_raw_request(hdev, 0xf2, buf, SIXAXIS_REPORT_0xF2_SIZE,
HID_FEATURE_REPORT, HID_REQ_GET_REPORT);

if (ret < 0) {
hid_err(hdev, "can't set operational mode: step 1\n");
goto out;
Expand All @@ -1153,14 +1153,12 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
*/
ret = hid_hw_raw_request(hdev, 0xf5, buf, SIXAXIS_REPORT_0xF5_SIZE,
HID_FEATURE_REPORT, HID_REQ_GET_REPORT);

if (ret < 0) {
hid_err(hdev, "can't set operational mode: step 2\n");
goto out;
}

ret = hid_hw_output_report(hdev, buf, 1);

if (ret < 0)
hid_err(hdev, "can't set operational mode: step 3\n");

Expand Down

0 comments on commit 2e701a3

Please sign in to comment.