leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: introduce helper to access hid_output_raw_report()

Browse Source 
Add a helper to access hdev->hid_output_raw_report().

To convert the drivers, use the following snippets:

for i in drivers/hid/*.c
do
  sed -i.bak "s/[^ \t]*->hid_output_raw_report(/hid_output_raw_report(/g" $i
done

Then manually fix for checkpatch.pl

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Benjamin Tissoires
2014-02-05 16:33:23 -05:00
committed by Jiri Kosina
parent cafebc058b
commit 7e845d46b1
9 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/hid-input.c
View File

@@ -1184,7 +1184,7 @@ static void hidinput_led_worker(struct work_struct *work)
hid_output_report(report, buf); hid_output_report(report, buf);
/* synchronous output report */ /* synchronous output report */
hid->hid_output_raw_report(hid, buf, len, HID_OUTPUT_REPORT); hid_output_raw_report(hid, buf, len, HID_OUTPUT_REPORT);
kfree(buf); kfree(buf);
} }

6
drivers/hid/hid-lg.c
View File

@@ -692,7 +692,8 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) { if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
unsigned char buf[] = { 0x00, 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; unsigned char buf[] = { 0x00, 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); ret = hid_output_raw_report(hdev, buf, sizeof(buf),
HID_FEATURE_REPORT);
if (ret >= 0) { if (ret >= 0) {
/* insert a little delay of 10 jiffies ~ 40ms */ /* insert a little delay of 10 jiffies ~ 40ms */
@@ -704,7 +705,8 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
buf[1] = 0xB2; buf[1] = 0xB2;
get_random_bytes(&buf[2], 2); get_random_bytes(&buf[2], 2);
ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); ret = hid_output_raw_report(hdev, buf, sizeof(buf),
HID_FEATURE_REPORT);
} }
} }

2
drivers/hid/hid-magicmouse.c
View File

@@ -538,7 +538,7 @@ static int magicmouse_probe(struct hid_device *hdev,
* but there seems to be no other way of switching the mode. * but there seems to be no other way of switching the mode.
* Thus the super-ugly hacky success check below. * Thus the super-ugly hacky success check below.
*/ */
ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature), ret = hid_output_raw_report(hdev, feature, sizeof(feature),
HID_FEATURE_REPORT); HID_FEATURE_REPORT);
if (ret != -EIO && ret != sizeof(feature)) { if (ret != -EIO && ret != sizeof(feature)) {
hid_err(hdev, "unable to request touch data (%d)\n", ret); hid_err(hdev, "unable to request touch data (%d)\n", ret);

6
drivers/hid/hid-sony.c
View File

@@ -720,7 +720,8 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
static int sixaxis_set_operational_bt(struct hid_device *hdev) static int sixaxis_set_operational_bt(struct hid_device *hdev)
{ {
unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 }; unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); return hid_output_raw_report(hdev, buf, sizeof(buf),
HID_FEATURE_REPORT);
} }
static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds) static void buzz_set_leds(struct hid_device *hdev, const __u8 *leds)
@@ -942,8 +943,7 @@ static void sixaxis_state_worker(struct work_struct *work)
buf[10] |= sc->led_state[2] << 3; buf[10] |= sc->led_state[2] << 3;
buf[10] |= sc->led_state[3] << 4; buf[10] |= sc->led_state[3] << 4;
sc->hdev->hid_output_raw_report(sc->hdev, buf, sizeof(buf), hid_output_raw_report(sc->hdev, buf, sizeof(buf), HID_OUTPUT_REPORT);
HID_OUTPUT_REPORT);
} }
static void dualshock4_state_worker(struct work_struct *work) static void dualshock4_state_worker(struct work_struct *work)

4
drivers/hid/hid-thingm.c
View File

@@ -48,8 +48,8 @@ static int blink1_send_command(struct blink1_data *data,
buf[0], buf[1], buf[2], buf[3], buf[4], buf[0], buf[1], buf[2], buf[3], buf[4],
buf[5], buf[6], buf[7], buf[8]); buf[5], buf[6], buf[7], buf[8]);
ret = data->hdev->hid_output_raw_report(data->hdev, buf, ret = hid_output_raw_report(data->hdev, buf, BLINK1_CMD_SIZE,
BLINK1_CMD_SIZE, HID_FEATURE_REPORT); HID_FEATURE_REPORT);
return ret < 0 ? ret : 0; return ret < 0 ? ret : 0;
} }

16
drivers/hid/hid-wacom.c
View File

@@ -128,8 +128,7 @@ static void wacom_set_image(struct hid_device *hdev, const char *image,
rep_data[0] = WAC_CMD_ICON_START_STOP; rep_data[0] = WAC_CMD_ICON_START_STOP;
rep_data[1] = 0; rep_data[1] = 0;
ret = hdev->hid_output_raw_report(hdev, rep_data, 2, ret = hid_output_raw_report(hdev, rep_data, 2, HID_FEATURE_REPORT);
HID_FEATURE_REPORT);
if (ret < 0) if (ret < 0)
goto err; goto err;
@@ -143,15 +142,14 @@ static void wacom_set_image(struct hid_device *hdev, const char *image,
rep_data[j + 3] = p[(i << 6) + j]; rep_data[j + 3] = p[(i << 6) + j];
rep_data[2] = i; rep_data[2] = i;
ret = hdev->hid_output_raw_report(hdev, rep_data, 67, ret = hid_output_raw_report(hdev, rep_data, 67,
HID_FEATURE_REPORT); HID_FEATURE_REPORT);
} }
rep_data[0] = WAC_CMD_ICON_START_STOP; rep_data[0] = WAC_CMD_ICON_START_STOP;
rep_data[1] = 0; rep_data[1] = 0;
ret = hdev->hid_output_raw_report(hdev, rep_data, 2, ret = hid_output_raw_report(hdev, rep_data, 2, HID_FEATURE_REPORT);
HID_FEATURE_REPORT);
err: err:
return; return;
@@ -183,7 +181,7 @@ static void wacom_leds_set_brightness(struct led_classdev *led_dev,
buf[3] = value; buf[3] = value;
/* use fixed brightness for OLEDs */ /* use fixed brightness for OLEDs */
buf[4] = 0x08; buf[4] = 0x08;
hdev->hid_output_raw_report(hdev, buf, 9, HID_FEATURE_REPORT); hid_output_raw_report(hdev, buf, 9, HID_FEATURE_REPORT);
kfree(buf); kfree(buf);
} }
@@ -339,7 +337,7 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
rep_data[0] = 0x03 ; rep_data[1] = 0x00; rep_data[0] = 0x03 ; rep_data[1] = 0x00;
limit = 3; limit = 3;
do { do {
ret = hdev->hid_output_raw_report(hdev, rep_data, 2, ret = hid_output_raw_report(hdev, rep_data, 2,
HID_FEATURE_REPORT); HID_FEATURE_REPORT);
} while (ret < 0 && limit-- > 0); } while (ret < 0 && limit-- > 0);
@@ -352,7 +350,7 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
rep_data[1] = 0x00; rep_data[1] = 0x00;
limit = 3; limit = 3;
do { do {
ret = hdev->hid_output_raw_report(hdev, ret = hid_output_raw_report(hdev,
rep_data, 2, HID_FEATURE_REPORT); rep_data, 2, HID_FEATURE_REPORT);
} while (ret < 0 && limit-- > 0); } while (ret < 0 && limit-- > 0);
@@ -378,7 +376,7 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
rep_data[0] = 0x03; rep_data[0] = 0x03;
rep_data[1] = wdata->features; rep_data[1] = wdata->features;
ret = hdev->hid_output_raw_report(hdev, rep_data, 2, ret = hid_output_raw_report(hdev, rep_data, 2,
HID_FEATURE_REPORT); HID_FEATURE_REPORT);
if (ret >= 0) if (ret >= 0)
wdata->high_speed = speed; wdata->high_speed = speed;

2
drivers/hid/hid-wiimote-core.c
View File

@@ -35,7 +35,7 @@ static int wiimote_hid_send(struct hid_device *hdev, __u8 *buffer,
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
ret = hdev->hid_output_raw_report(hdev, buf, count, HID_OUTPUT_REPORT); ret = hid_output_raw_report(hdev, buf, count, HID_OUTPUT_REPORT);
kfree(buf); kfree(buf);
return ret; return ret;

2
drivers/hid/hidraw.c
View File

@@ -153,7 +153,7 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer,
goto out_free; goto out_free;
} }
ret = dev->hid_output_raw_report(dev, buf, count, report_type); ret = hid_output_raw_report(dev, buf, count, report_type);
out_free: out_free:
kfree(buf); kfree(buf);
out: out:

16
include/linux/hid.h
View File

@@ -1011,6 +1011,22 @@ static inline int hid_hw_output_report(struct hid_device *hdev, __u8 *buf,
return -ENOSYS; return -ENOSYS;
} }
/**
* hid_output_raw_report - send an output or a feature report to the device
*
* @hdev: hid device
* @buf: raw data to transfer
* @len: length of buf
* @report_type: HID_FEATURE_REPORT or HID_OUTPUT_REPORT
*
* @return: count of data transfered, negative if error
*/
static inline int hid_output_raw_report(struct hid_device *hdev, __u8 *buf,
size_t len, unsigned char report_type)
{
return hdev->hid_output_raw_report(hdev, buf, len, report_type);
}
/** /**
* hid_hw_idle - send idle request to device * hid_hw_idle - send idle request to device
* *