evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hso: replace reset_device work by usb_queue_reset_device()

Browse source 
There is no need for a dedicated reset work in the hso driver since
there is already a reset work foreseen in usb_interface that does
the same.

Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Olivier Sobrie 2015-01-30 13:21:59 +01:00 • committed by David S. Miller
parent f6516b697c
commit 26c1f1f544
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/net/usb/hso.c
View file

@ -274,7 +274,6 @@ struct hso_device {
u8 usb_gone; u8 usb_gone;
struct work_struct async_get_intf; struct work_struct async_get_intf;
struct work_struct async_put_intf; struct work_struct async_put_intf;
struct work_struct reset_device;
struct usb_device *usb; struct usb_device *usb;
struct usb_interface *interface; struct usb_interface *interface;
@ -340,7 +339,6 @@ static void async_put_intf(struct work_struct *data);
static int hso_put_activity(struct hso_device *hso_dev); static int hso_put_activity(struct hso_device *hso_dev);
static int hso_get_activity(struct hso_device *hso_dev); static int hso_get_activity(struct hso_device *hso_dev);
static void tiocmget_intr_callback(struct urb *urb); static void tiocmget_intr_callback(struct urb *urb);
static void reset_device(struct work_struct *data);
/*****************************************************************************/ /*****************************************************************************/
/* Helping functions */ /* Helping functions */
/*****************************************************************************/ /*****************************************************************************/
@ -696,7 +694,7 @@ static void handle_usb_error(int status, const char *function,
case -ETIMEDOUT: case -ETIMEDOUT:
explanation = "protocol error"; explanation = "protocol error";
if (hso_dev) if (hso_dev)
schedule_work(&hso_dev->reset_device); usb_queue_reset_device(hso_dev->interface);
break; break;
default: default:
explanation = "unknown status"; explanation = "unknown status";
@ -2347,7 +2345,6 @@ static struct hso_device *hso_create_device(struct usb_interface *intf,
INIT_WORK(&hso_dev->async_get_intf, async_get_intf); INIT_WORK(&hso_dev->async_get_intf, async_get_intf);
INIT_WORK(&hso_dev->async_put_intf, async_put_intf); INIT_WORK(&hso_dev->async_put_intf, async_put_intf);
INIT_WORK(&hso_dev->reset_device, reset_device);
return hso_dev; return hso_dev;
} }
@ -3085,26 +3082,6 @@ out:
return result; return result;
} }
static void reset_device(struct work_struct *data)
{
struct hso_device *hso_dev =
container_of(data, struct hso_device, reset_device);
struct usb_device *usb = hso_dev->usb;
int result;
if (hso_dev->usb_gone) {
D1("No reset during disconnect\n");
} else {
result = usb_lock_device_for_reset(usb, hso_dev->interface);
if (result < 0)
D1("unable to lock device for reset: %d\n", result);
else {
usb_reset_device(usb);
usb_unlock_device(usb);
}
}
}
static void hso_serial_ref_free(struct kref *ref) static void hso_serial_ref_free(struct kref *ref)
{ {
struct hso_device *hso_dev = container_of(ref, struct hso_device, ref); struct hso_device *hso_dev = container_of(ref, struct hso_device, ref);