diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-03-09 04:52:40 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:29:53 +0100 |
commit | 293e483defe499f3c33dfd6e022bf5d0b01ff27f (patch) | |
tree | 3b5040c9ef33a32554b0df94879e18bfc98820b7 /drivers/hid/hid-cp2112.c | |
parent | Merge branch 'for-3.15/hid-cp2112' into for-3.15/hid-core-ll-transport-cleanup (diff) | |
download | linux-293e483defe499f3c33dfd6e022bf5d0b01ff27f.tar.xz linux-293e483defe499f3c33dfd6e022bf5d0b01ff27f.zip |
HID: cp2112: remove various hid_out_raw_report calls
hid_out_raw_report is going to be obsoleted as it is not part of the
unified HID low level transport documentation
(Documentation/hid/hid-transport.txt)
hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
is strictly equivalent to:
hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
Then replace buf[0] by the appropriate define.
So use the new api.
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>
Diffstat (limited to 'drivers/hid/hid-cp2112.c')
-rw-r--r-- | drivers/hid/hid-cp2112.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 1025982c7fd3..3913eb9fec2a 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -185,8 +185,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) buf[1] &= ~(1 << offset); buf[2] = gpio_push_pull; - ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), - HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, sizeof(buf), + HID_FEATURE_REPORT, HID_REQ_SET_REPORT); if (ret < 0) { hid_err(hdev, "error setting GPIO config: %d\n", ret); return ret; @@ -207,8 +207,8 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value) buf[1] = value ? 0xff : 0; buf[2] = 1 << offset; - ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), - HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_SET, buf, sizeof(buf), + HID_FEATURE_REPORT, HID_REQ_SET_REPORT); if (ret < 0) hid_err(hdev, "error setting GPIO values: %d\n", ret); } @@ -253,8 +253,8 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, buf[1] |= 1 << offset; buf[2] = gpio_push_pull; - ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), - HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, sizeof(buf), + HID_FEATURE_REPORT, HID_REQ_SET_REPORT); if (ret < 0) { hid_err(hdev, "error setting GPIO config: %d\n", ret); return ret; |