aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/hid-lgff.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2006-12-08 12:41:03 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-08 13:43:14 -0500
commit4916b3a57fc94664677d439b911b8aaf86c7ec23 (patch)
treefc8038ec52950ddfdb1c6c66f90eb1c381e446ca /drivers/usb/input/hid-lgff.c
parent229695e51efc4ed5e04ab471c82591d0f432909d (diff)
[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>
Diffstat (limited to 'drivers/usb/input/hid-lgff.c')
-rw-r--r--drivers/usb/input/hid-lgff.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/input/hid-lgff.c b/drivers/usb/input/hid-lgff.c
index e977ba3d17e0..e47466268565 100644
--- a/drivers/usb/input/hid-lgff.c
+++ b/drivers/usb/input/hid-lgff.c
@@ -30,6 +30,7 @@
30#include <linux/input.h> 30#include <linux/input.h>
31#include <linux/usb.h> 31#include <linux/usb.h>
32#include <linux/hid.h> 32#include <linux/hid.h>
33#include "usbhid.h"
33 34
34struct device_type { 35struct device_type {
35 u16 idVendor; 36 u16 idVendor;
@@ -75,7 +76,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
75 report->field[0]->value[2] = x; 76 report->field[0]->value[2] = x;
76 report->field[0]->value[3] = y; 77 report->field[0]->value[3] = y;
77 dbg("(x, y)=(%04x, %04x)", x, y); 78 dbg("(x, y)=(%04x, %04x)", x, y);
78 hid_submit_report(hid, report, USB_DIR_OUT); 79 usbhid_submit_report(hid, report, USB_DIR_OUT);
79 break; 80 break;
80 81
81 case FF_RUMBLE: 82 case FF_RUMBLE:
@@ -90,7 +91,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
90 report->field[0]->value[2] = left; 91 report->field[0]->value[2] = left;
91 report->field[0]->value[3] = right; 92 report->field[0]->value[3] = right;
92 dbg("(left, right)=(%04x, %04x)", left, right); 93 dbg("(left, right)=(%04x, %04x)", left, right);
93 hid_submit_report(hid, report, USB_DIR_OUT); 94 usbhid_submit_report(hid, report, USB_DIR_OUT);
94 break; 95 break;
95 } 96 }
96 return 0; 97 return 0;