summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/u132-hcd.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-03-06 17:00:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 21:16:41 -0700
commit70a1c9e086c2e267fbc4533cb870f34999b531d6 (patch)
treef599883bdc2f04d4ca4760dfdb1f1131fa6b7060 /drivers/usb/host/u132-hcd.c
parente1879b19b0abdb387e4aeb0b935a486cc75042fb (diff)
downloadblackbird-op-linux-70a1c9e086c2e267fbc4533cb870f34999b531d6.tar.gz
blackbird-op-linux-70a1c9e086c2e267fbc4533cb870f34999b531d6.zip
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.c7
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)
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 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state)
}
break;
}
- if (retval == 0)
- pdev->dev.power.power_state = state;
return retval;
}
}
@@ -3246,14 +3242,13 @@ static int u132_resume(struct platform_device *pdev)
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;
OpenPOWER on IntegriCloud