diff options
Diffstat (limited to 'drivers/usb/gadget/zero.c')
| -rw-r--r-- | drivers/usb/gadget/zero.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index f49b0b6..0deb9d6 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c @@ -91,22 +91,10 @@ static struct usb_zero_options gzero_options = { * functional coverage for the "USBCV" test harness from USB-IF. * It's always set if OTG mode is enabled. */ -static unsigned autoresume = DEFAULT_AUTORESUME; +unsigned autoresume = DEFAULT_AUTORESUME; module_param(autoresume, uint, S_IRUGO); MODULE_PARM_DESC(autoresume, "zero, or seconds before remote wakeup"); -/* Maximum Autoresume time */ -static unsigned max_autoresume; -module_param(max_autoresume, uint, S_IRUGO); -MODULE_PARM_DESC(max_autoresume, "maximum seconds before remote wakeup"); - -/* Interval between two remote wakeups */ -static unsigned autoresume_interval_ms; -module_param(autoresume_interval_ms, uint, S_IRUGO); -MODULE_PARM_DESC(autoresume_interval_ms, - "milliseconds to increase successive wakeup delays"); - -static unsigned autoresume_step_ms; /*-------------------------------------------------------------------------*/ static struct usb_device_descriptor device_desc = { @@ -195,16 +183,8 @@ static void zero_suspend(struct usb_composite_dev *cdev) return; if (autoresume) { - if (max_autoresume && - (autoresume_step_ms > max_autoresume * 1000)) - autoresume_step_ms = autoresume * 1000; - - mod_timer(&autoresume_timer, jiffies + - msecs_to_jiffies(autoresume_step_ms)); - DBG(cdev, "suspend, wakeup in %d milliseconds\n", - autoresume_step_ms); - - autoresume_step_ms += autoresume_interval_ms; + mod_timer(&autoresume_timer, jiffies + (HZ * autoresume)); + DBG(cdev, "suspend, wakeup in %d seconds\n", autoresume); } else DBG(cdev, "%s\n", __func__); } @@ -336,7 +316,6 @@ static int __init zero_bind(struct usb_composite_dev *cdev) if (autoresume) { sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP; loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP; - autoresume_step_ms = autoresume * 1000; } /* support OTG systems */ |