USB: fix leftover references to udev->autosuspend_delay

This patch (as1436) takes care of leftover references to
udev->autosuspend_delay that didn't get removed during the earlier
conversion to the runtime-PM autosuspend API.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c
index 4555f4a..e33b428 100644 (file)
--- a/drivers/media/video/tlg2300/pd-main.c
+++ b/drivers/media/video/tlg2300/pd-main.c
@@ -453,7 +453,8 @@ static int poseidon_probe(struct usb_interface *interface,
 
        device_init_wakeup(&udev->dev, 1);
 #ifdef CONFIG_PM
-       pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
+       pm_runtime_set_autosuspend_delay(&pd->udev->dev,
+                       1000 * PM_SUSPEND_DELAY);
        usb_enable_autosuspend(pd->udev);
 
        if (in_hibernation(pd)) {

diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index d3365ac..7cb3755 100644 (file)
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *iface,
 #ifdef CONFIG_PM
        iface->needs_remote_wakeup = 1;         /* autosuspend (15s delay) */
        device_init_wakeup(dev, 1);
-       usb_dev->autosuspend_delay = 15 * HZ;
+       pm_runtime_set_autosuspend_delay(&usb_dev->dev, 15000);
        usb_enable_autosuspend(usb_dev);
 #endif
 

diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 824f9a4..e97ad99 100644 (file)
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -277,7 +277,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
                if(psAdapter->bDoSuspend)
                {
 #ifdef CONFIG_PM
-                       udev->autosuspend_delay = 0;
+                       pm_runtime_set_autosuspend_delay(&udev->dev, 0);
                        intf->needs_remote_wakeup = 1;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
                        udev->autosuspend_disabled = 0;