diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-18 00:39:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-18 00:39:39 +0100 |
| commit | 490051ad164ac53a96ca41f6edc270640bfc499d (patch) | |
| tree | dc7a985afaeb98ae173b92af5a7936b179de18f9 /drivers | |
| parent | Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-3.15/hid-cp2112 (diff) | |
| download | linux-490051ad164ac53a96ca41f6edc270640bfc499d.tar.xz linux-490051ad164ac53a96ca41f6edc270640bfc499d.zip | |
HID: cp2112: convert to use hid_hw_raw_request()
Commit cafebc0 ("HID: remove hid_get_raw_report in struct hid_device")
obsoletes the use of hdev->hid_get_raw_report(), as calling
hid_hw_raw_request() is functionally equivalent.
Convert cp2112 to use this notation.
Reported-by: fengguang.wu@intel.com
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-cp2112.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index f32672624691..6d679f1840a7 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -174,8 +174,9 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) u8 buf[5]; int ret; - ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_CONFIG, buf, - sizeof(buf), HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, + sizeof(buf), HID_FEATURE_REPORT, + HID_REQ_GET_REPORT); if (ret != sizeof(buf)) { hid_err(hdev, "error requesting GPIO config: %d\n", ret); return ret; @@ -220,8 +221,8 @@ static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset) u8 buf[2]; int ret; - ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_GET, buf, sizeof(buf), - HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf, sizeof(buf), + HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret != sizeof(buf)) { hid_err(hdev, "error requesting GPIO values: %d\n", ret); return ret; @@ -241,8 +242,9 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip, cp2112_gpio_set(chip, offset, value); - ret = hdev->hid_get_raw_report(hdev, CP2112_GPIO_CONFIG, buf, - sizeof(buf), HID_FEATURE_REPORT); + ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, + sizeof(buf), HID_FEATURE_REPORT, + HID_REQ_GET_REPORT); if (ret != sizeof(buf)) { hid_err(hdev, "error requesting GPIO config: %d\n", ret); return ret; @@ -271,8 +273,8 @@ static int cp2112_hid_get(struct hid_device *hdev, unsigned char report_number, if (!buf) return -ENOMEM; - ret = hdev->hid_get_raw_report(hdev, report_number, buf, count, - report_type); + ret = hid_hw_raw_request(hdev, report_number, buf, count, + report_type, HID_REQ_GET_REPORT); memcpy(data, buf, count); kfree(buf); return ret; |