aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-tmff.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2013-02-25 05:31:46 -0500
committerJiri Kosina <jkosina@suse.cz>2013-02-25 07:26:41 -0500
commitd881427253da011495f4193663d809d0e9dfa215 (patch)
treefe4eb817ab712f7049b1d3ef675fec69d9207675 /drivers/hid/hid-tmff.c
parentf3757cea18fadce23c95a4c4bc3123af73a95e65 (diff)
HID: use hid_hw_request() instead of direct call to usbhid
This allows the hid drivers to be independent from the transport layer. The patch was constructed by replacing all occurences of usbhid_submit_report() by its hid_hw_request() counterpart. Then, drivers not requiring USB_HID anymore have their USB_HID dependency cleaned in the Kconfig file. Finally, few drivers still depends on USB_HID. Many of them are requiring the io wait callback. They are found in the next patch. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> For the sensor-hub part: Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-tmff.c')
-rw-r--r--drivers/hid/hid-tmff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index e4fcf3f702a5..b83376077d72 100644
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -30,7 +30,6 @@
30#include <linux/hid.h> 30#include <linux/hid.h>
31#include <linux/input.h> 31#include <linux/input.h>
32#include <linux/slab.h> 32#include <linux/slab.h>
33#include <linux/usb.h>
34#include <linux/module.h> 33#include <linux/module.h>
35 34
36#include "hid-ids.h" 35#include "hid-ids.h"
@@ -46,7 +45,6 @@ static const signed short ff_joystick[] = {
46}; 45};
47 46
48#ifdef CONFIG_THRUSTMASTER_FF 47#ifdef CONFIG_THRUSTMASTER_FF
49#include "usbhid/usbhid.h"
50 48
51/* Usages for thrustmaster devices I know about */ 49/* Usages for thrustmaster devices I know about */
52#define THRUSTMASTER_USAGE_FF (HID_UP_GENDESK | 0xbb) 50#define THRUSTMASTER_USAGE_FF (HID_UP_GENDESK | 0xbb)
@@ -103,7 +101,7 @@ static int tmff_play(struct input_dev *dev, void *data,
103 dbg_hid("(x, y)=(%04x, %04x)\n", x, y); 101 dbg_hid("(x, y)=(%04x, %04x)\n", x, y);
104 ff_field->value[0] = x; 102 ff_field->value[0] = x;
105 ff_field->value[1] = y; 103 ff_field->value[1] = y;
106 usbhid_submit_report(hid, tmff->report, USB_DIR_OUT); 104 hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT);
107 break; 105 break;
108 106
109 case FF_RUMBLE: 107 case FF_RUMBLE:
@@ -117,7 +115,7 @@ static int tmff_play(struct input_dev *dev, void *data,
117 dbg_hid("(left,right)=(%08x, %08x)\n", left, right); 115 dbg_hid("(left,right)=(%08x, %08x)\n", left, right);
118 ff_field->value[0] = left; 116 ff_field->value[0] = left;
119 ff_field->value[1] = right; 117 ff_field->value[1] = right;
120 usbhid_submit_report(hid, tmff->report, USB_DIR_OUT); 118 hid_hw_request(hid, tmff->report, HID_REQ_SET_REPORT);
121 break; 119 break;
122 } 120 }
123 return 0; 121 return 0;