mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
PM: Rename dev_pm_info.in_suspend to is_prepared
This patch (as1473) renames the "in_suspend" field in struct dev_pm_info to "is_prepared", in preparation for an upcoming change. The new name is more descriptive of what the field really means. Signed-off-by: Alan Stern <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Cc: [email protected]
This commit is contained in:
parent
78420884e6
commit
f76b168b6f
4 changed files with 15 additions and 11 deletions
|
|
@ -375,7 +375,7 @@ static int usb_unbind_interface(struct device *dev)
|
|||
* Just re-enable it without affecting the endpoint toggles.
|
||||
*/
|
||||
usb_enable_interface(udev, intf, false);
|
||||
} else if (!error && !intf->dev.power.in_suspend) {
|
||||
} else if (!error && !intf->dev.power.is_prepared) {
|
||||
r = usb_set_interface(udev, intf->altsetting[0].
|
||||
desc.bInterfaceNumber, 0);
|
||||
if (r < 0)
|
||||
|
|
@ -960,7 +960,7 @@ void usb_rebind_intf(struct usb_interface *intf)
|
|||
}
|
||||
|
||||
/* Try to rebind the interface */
|
||||
if (!intf->dev.power.in_suspend) {
|
||||
if (!intf->dev.power.is_prepared) {
|
||||
intf->needs_binding = 0;
|
||||
rc = device_attach(&intf->dev);
|
||||
if (rc < 0)
|
||||
|
|
@ -1107,7 +1107,7 @@ static int usb_resume_interface(struct usb_device *udev,
|
|||
if (intf->condition == USB_INTERFACE_UNBOUND) {
|
||||
|
||||
/* Carry out a deferred switch to altsetting 0 */
|
||||
if (intf->needs_altsetting0 && !intf->dev.power.in_suspend) {
|
||||
if (intf->needs_altsetting0 && !intf->dev.power.is_prepared) {
|
||||
usb_set_interface(udev, intf->altsetting[0].
|
||||
desc.bInterfaceNumber, 0);
|
||||
intf->needs_altsetting0 = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue