USB: remove dev->power.power_state
power.power_state is scheduled for removal. This patch (as1053)
removes all uses of that field from drivers/usb. Almost all of them
were write-only, the most significant exceptions being sl811-hcd.c and
u132-hcd.c.
Part of this patch was written by Pavel Machek.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 8e117a7..6e9b7ed 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -1534,11 +1534,9 @@
if (u132->power)
return;
u132->power = 1;
- hcd->self.controller->power.power_state = PMSG_ON;
} else {
u132->power = 0;
hcd->state = HC_STATE_HALT;
- hcd->self.controller->power.power_state = PMSG_SUSPEND;
}
}
@@ -3227,8 +3225,6 @@
}
break;
}
- if (retval == 0)
- pdev->dev.power.power_state = state;
return retval;
}
}
@@ -3246,14 +3242,13 @@
return -ESHUTDOWN;
} else {
int retval = 0;
- if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
+ if (!u132->port[0].power) {
int ports = MAX_U132_PORTS;
while (ports-- > 0) {
port_power(u132, ports, 1);
}
retval = 0;
} else {
- pdev->dev.power.power_state = PMSG_ON;
retval = u132_bus_resume(hcd);
}
return retval;