[PATCH] Generic HID layer - USB API

- 'dev' in struct hid_device changed from struct usb_device to
  struct device and fixed all the users
- renamed functions which are part of USB HID API from 'hid_*' to
  'usbhid_*'
- force feedback initialization moved from common part into USB-specific
  driver
- added usbhid.h header for USB HID API users
- removed USB-specific fields from struct hid_device and moved them
  to new usbhid_device, which is pointed to by hid_device->driver_data
- fixed all USB users to use this new structure

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/input/hid-zpff.c b/drivers/usb/input/hid-zpff.c
index af1bfae39dce..7bd8238ca212 100644
--- a/drivers/usb/input/hid-zpff.c
+++ b/drivers/usb/input/hid-zpff.c
@@ -28,6 +28,7 @@
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include "usbhid.h"
 
 struct zpff_device {
         struct hid_report *report;
@@ -56,7 +57,7 @@ static int hid_zpff_play(struct input_dev *dev, void *data,
         zpff->report->field[2]->value[0] = left;
         zpff->report->field[3]->value[0] = right;
         debug("running with 0x%02x 0x%02x", left, right);
-        hid_submit_report(hid, zpff->report, USB_DIR_OUT);
+        usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
 
         return 0;
 }
@@ -101,7 +102,7 @@ int hid_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;
-        hid_submit_report(hid, zpff->report, USB_DIR_OUT);
+        usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
 
         printk(KERN_INFO "Force feedback for Zeroplus based devices by "
                "Anssi Hannula <anssi.hannula@gmail.com>\n");