diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2009-11-13 11:53:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:21 -0500 |
commit | fb34d53752d5bec5acc73422e462a9c68aeeaa2a (patch) | |
tree | 6a395f2a0246cd3d721753c60af13e8f9b2e9c41 /drivers/net | |
parent | 576a362ad2103da481e1f6e13de01f33d3d4c7b1 (diff) |
USB: remove the auto_pm flag
This patch (as1302) removes the auto_pm flag from struct usb_device.
The flag's only purpose was to distinguish between autosuspends and
external suspends, but that information is now available in the
pm_message_t argument passed to suspend methods.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 47e84ef355c5..3b48681f8a0d 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c | |||
@@ -579,7 +579,7 @@ void i2400mu_disconnect(struct usb_interface *iface) | |||
579 | * | 579 | * |
580 | * As well, the device might refuse going to sleep for whichever | 580 | * As well, the device might refuse going to sleep for whichever |
581 | * reason. In this case we just fail. For system suspend/hibernate, | 581 | * reason. In this case we just fail. For system suspend/hibernate, |
582 | * we *can't* fail. We look at usb_dev->auto_pm to see if the | 582 | * we *can't* fail. We check PM_EVENT_AUTO to see if the |
583 | * suspend call comes from the USB stack or from the system and act | 583 | * suspend call comes from the USB stack or from the system and act |
584 | * in consequence. | 584 | * in consequence. |
585 | * | 585 | * |
@@ -591,14 +591,11 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg) | |||
591 | int result = 0; | 591 | int result = 0; |
592 | struct device *dev = &iface->dev; | 592 | struct device *dev = &iface->dev; |
593 | struct i2400mu *i2400mu = usb_get_intfdata(iface); | 593 | struct i2400mu *i2400mu = usb_get_intfdata(iface); |
594 | #ifdef CONFIG_PM | ||
595 | struct usb_device *usb_dev = i2400mu->usb_dev; | ||
596 | #endif | ||
597 | unsigned is_autosuspend = 0; | 594 | unsigned is_autosuspend = 0; |
598 | struct i2400m *i2400m = &i2400mu->i2400m; | 595 | struct i2400m *i2400m = &i2400mu->i2400m; |
599 | 596 | ||
600 | #ifdef CONFIG_PM | 597 | #ifdef CONFIG_PM |
601 | if (usb_dev->auto_pm > 0) | 598 | if (pm_msg.event & PM_EVENT_AUTO) |
602 | is_autosuspend = 1; | 599 | is_autosuspend = 1; |
603 | #endif | 600 | #endif |
604 | 601 | ||