HID: use hid_hw_request() instead of direct call to usbhid

[mirror_ubuntu-bionic-kernel.git] / drivers / hid / hid-picolcd_core.c

diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index 31cd93fc3d4bff26fb0275d102c90270483289e7..b48092d0e1394a73f4c4ef66a21bc490f4b686f0 100644 (file)
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -21,8 +21,6 @@
 #include <linux/hid-debug.h>
 #include <linux/input.h>
 #include "hid-ids.h"
-#include "usbhid/usbhid.h"
-#include <linux/usb.h>
 
 #include <linux/fb.h>
 #include <linux/vmalloc.h>
@@ -110,7 +108,7 @@ struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev,
                work = NULL;
        } else {
                data->pending = work;
-               usbhid_submit_report(data->hdev, report, USB_DIR_OUT);
+               hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT);
                spin_unlock_irqrestore(&data->lock, flags);
                wait_for_completion_interruptible_timeout(&work->ready, HZ*2);
                spin_lock_irqsave(&data->lock, flags);
@@ -244,7 +242,7 @@ int picolcd_reset(struct hid_device *hdev)
                spin_unlock_irqrestore(&data->lock, flags);
                return -ENODEV;
        }
-       usbhid_submit_report(hdev, report, USB_DIR_OUT);
+       hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
        spin_unlock_irqrestore(&data->lock, flags);
 
        error = picolcd_check_version(hdev);
@@ -303,7 +301,7 @@ static ssize_t picolcd_operation_mode_store(struct device *dev,
        spin_lock_irqsave(&data->lock, flags);
        hid_set_field(report->field[0], 0, timeout & 0xff);
        hid_set_field(report->field[0], 1, (timeout >> 8) & 0xff);
-       usbhid_submit_report(data->hdev, report, USB_DIR_OUT);
+       hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT);
        spin_unlock_irqrestore(&data->lock, flags);
        return count;
 }