diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2008-03-06 17:00:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:41 -0400 |
commit | 70a1c9e086c2e267fbc4533cb870f34999b531d6 (patch) | |
tree | f599883bdc2f04d4ca4760dfdb1f1131fa6b7060 /drivers/usb/host/u132-hcd.c | |
parent | e1879b19b0abdb387e4aeb0b935a486cc75042fb (diff) |
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>
Diffstat (limited to 'drivers/usb/host/u132-hcd.c')
-rw-r--r-- | drivers/usb/host/u132-hcd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 8e117a795e93..6e9b7edff528 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -1534,11 +1534,9 @@ static void u132_power(struct u132 *u132, int is_on) | |||
1534 | if (u132->power) | 1534 | if (u132->power) |
1535 | return; | 1535 | return; |
1536 | u132->power = 1; | 1536 | u132->power = 1; |
1537 | hcd->self.controller->power.power_state = PMSG_ON; | ||
1538 | } else { | 1537 | } else { |
1539 | u132->power = 0; | 1538 | u132->power = 0; |
1540 | hcd->state = HC_STATE_HALT; | 1539 | hcd->state = HC_STATE_HALT; |
1541 | hcd->self.controller->power.power_state = PMSG_SUSPEND; | ||
1542 | } | 1540 | } |
1543 | } | 1541 | } |
1544 | 1542 | ||
@@ -3227,8 +3225,6 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state) | |||
3227 | } | 3225 | } |
3228 | break; | 3226 | break; |
3229 | } | 3227 | } |
3230 | if (retval == 0) | ||
3231 | pdev->dev.power.power_state = state; | ||
3232 | return retval; | 3228 | return retval; |
3233 | } | 3229 | } |
3234 | } | 3230 | } |
@@ -3246,14 +3242,13 @@ static int u132_resume(struct platform_device *pdev) | |||
3246 | return -ESHUTDOWN; | 3242 | return -ESHUTDOWN; |
3247 | } else { | 3243 | } else { |
3248 | int retval = 0; | 3244 | int retval = 0; |
3249 | if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { | 3245 | if (!u132->port[0].power) { |
3250 | int ports = MAX_U132_PORTS; | 3246 | int ports = MAX_U132_PORTS; |
3251 | while (ports-- > 0) { | 3247 | while (ports-- > 0) { |
3252 | port_power(u132, ports, 1); | 3248 | port_power(u132, ports, 1); |
3253 | } | 3249 | } |
3254 | retval = 0; | 3250 | retval = 0; |
3255 | } else { | 3251 | } else { |
3256 | pdev->dev.power.power_state = PMSG_ON; | ||
3257 | retval = u132_bus_resume(hcd); | 3252 | retval = u132_bus_resume(hcd); |
3258 | } | 3253 | } |
3259 | return retval; | 3254 | return retval; |