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

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

diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c
index 27bc54f92f4484d7efc0ef687d70082c725b337f..d7ea8c845b4038ec2a943baa6f169ade22e82e3d 100644 (file)
--- a/drivers/hid/hid-lgff.c
+++ b/drivers/hid/hid-lgff.c
@@ -30,10 +30,8 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/input.h>
-#include <linux/usb.h>
 #include <linux/hid.h>
 
-#include "usbhid/usbhid.h"
 #include "hid-lg.h"
 
 struct dev_type {
@@ -89,7 +87,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                report->field[0]->value[2] = x;
                report->field[0]->value[3] = y;
                dbg_hid("(x, y)=(%04x, %04x)\n", x, y);
-               usbhid_submit_report(hid, report, USB_DIR_OUT);
+               hid_hw_request(hid, report, HID_REQ_SET_REPORT);
                break;
 
        case FF_RUMBLE:
@@ -104,7 +102,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                report->field[0]->value[2] = left;
                report->field[0]->value[3] = right;
                dbg_hid("(left, right)=(%04x, %04x)\n", left, right);
-               usbhid_submit_report(hid, report, USB_DIR_OUT);
+               hid_hw_request(hid, report, HID_REQ_SET_REPORT);
                break;
        }
        return 0;
@@ -124,7 +122,7 @@ static void hid_lgff_set_autocenter(struct input_dev *dev, u16 magnitude)
        *value++ = 0x80;
        *value++ = 0x00;
        *value = 0x00;
-       usbhid_submit_report(hid, report, USB_DIR_OUT);
+       hid_hw_request(hid, report, HID_REQ_SET_REPORT);
 }
 
 int lgff_init(struct hid_device* hid)