diff options
| author | Dmitry Torokhov | 2018-07-27 02:49:34 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2019-06-23 08:54:38 +0200 |
| commit | 2a1433ff08a1b23e3003483ee2883d327f78db9e (patch) | |
| tree | f946093884aa6611814f4c44d76885a33770036d /drivers/input/joystick/iforce/iforce-usb.c | |
| parent | Input: iforce - introduce transport ops (diff) | |
| download | kernel-qcow2-linux-2a1433ff08a1b23e3003483ee2883d327f78db9e.tar.gz kernel-qcow2-linux-2a1433ff08a1b23e3003483ee2883d327f78db9e.tar.xz kernel-qcow2-linux-2a1433ff08a1b23e3003483ee2883d327f78db9e.zip | |
Input: iforce - move get_id to the transport operations
To avoid #ifdef-ing out parts of the code and having conditionals in normal
control flow, let's define "get_id" transport method and move
implementation into respective transport modules.
Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-usb.c')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-usb.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index d4f7f34db9a0..f7eeaad92602 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -75,8 +75,37 @@ static void iforce_usb_xmit(struct iforce *iforce) __iforce_usb_xmit(iforce); } +static int iforce_usb_get_id(struct iforce *iforce, u8 *packet) +{ + int status; + + iforce->cr.bRequest = packet[0]; + iforce->ctrl->dev = iforce->usbdev; + + status = usb_submit_urb(iforce->ctrl, GFP_KERNEL); + if (status) { + dev_err(&iforce->intf->dev, + "usb_submit_urb failed %d\n", status); + return -EIO; + } + + wait_event_interruptible_timeout(iforce->wait, + iforce->ctrl->status != -EINPROGRESS, HZ); + + if (iforce->ctrl->status) { + dev_dbg(&iforce->intf->dev, + "iforce->ctrl->status = %d\n", + iforce->ctrl->status); + usb_unlink_urb(iforce->ctrl); + return -EIO; + } + + return -(iforce->edata[0] != packet[0]); +} + static const struct iforce_xport_ops iforce_usb_xport_ops = { .xmit = iforce_usb_xmit, + .get_id = iforce_usb_get_id, }; static void iforce_usb_irq(struct urb *urb) |