Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[firefly-linux-kernel-4.4.55.git] / drivers / hid / hid-zpff.c

diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c
index af66452592e963c8a5e91f17921e166e50699800..6ec28a37c146ab58d623ef1ccaafc38b3dcd9477 100644 (file)
--- a/drivers/hid/hid-zpff.c
+++ b/drivers/hid/hid-zpff.c
@@ -24,13 +24,11 @@
 #include <linux/hid.h>
 #include <linux/input.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
 #include <linux/module.h>
 
 #include "hid-ids.h"
 
 #ifdef CONFIG_ZEROPLUS_FF
-#include "usbhid/usbhid.h"
 
 struct zpff_device {
        struct hid_report *report;
@@ -59,7 +57,7 @@ static int zpff_play(struct input_dev *dev, void *data,
        zpff->report->field[2]->value[0] = left;
        zpff->report->field[3]->value[0] = right;
        dbg_hid("running with 0x%02x 0x%02x\n", left, right);
-       usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
+       hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT);
 
        return 0;
 }
@@ -104,7 +102,7 @@ static int zpff_init(struct hid_device *hid)
        zpff->report->field[1]->value[0] = 0x02;
        zpff->report->field[2]->value[0] = 0x00;
        zpff->report->field[3]->value[0] = 0x00;
-       usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
+       hid_hw_request(hid, zpff->report, HID_REQ_SET_REPORT);
 
        hid_info(hid, "force feedback for Zeroplus based devices by Anssi Hannula <anssi.hannula@gmail.com>\n");