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/gadget | |
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/gadget')
-rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index cbe44535c0f0..e454775c2ff2 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
@@ -900,7 +900,6 @@ static int dummy_udc_suspend (struct platform_device *pdev, pm_message_t state) | |||
900 | set_link_state (dum); | 900 | set_link_state (dum); |
901 | spin_unlock_irq (&dum->lock); | 901 | spin_unlock_irq (&dum->lock); |
902 | 902 | ||
903 | pdev->dev.power.power_state = state; | ||
904 | usb_hcd_poll_rh_status (dummy_to_hcd (dum)); | 903 | usb_hcd_poll_rh_status (dummy_to_hcd (dum)); |
905 | return 0; | 904 | return 0; |
906 | } | 905 | } |
@@ -915,7 +914,6 @@ static int dummy_udc_resume (struct platform_device *pdev) | |||
915 | set_link_state (dum); | 914 | set_link_state (dum); |
916 | spin_unlock_irq (&dum->lock); | 915 | spin_unlock_irq (&dum->lock); |
917 | 916 | ||
918 | pdev->dev.power.power_state = PMSG_ON; | ||
919 | usb_hcd_poll_rh_status (dummy_to_hcd (dum)); | 917 | usb_hcd_poll_rh_status (dummy_to_hcd (dum)); |
920 | return 0; | 918 | return 0; |
921 | } | 919 | } |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index ee1e9a314cd1..56277d24f041 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -1265,8 +1265,6 @@ static int can_pullup(struct omap_udc *udc) | |||
1265 | 1265 | ||
1266 | static void pullup_enable(struct omap_udc *udc) | 1266 | static void pullup_enable(struct omap_udc *udc) |
1267 | { | 1267 | { |
1268 | udc->gadget.dev.parent->power.power_state = PMSG_ON; | ||
1269 | udc->gadget.dev.power.power_state = PMSG_ON; | ||
1270 | UDC_SYSCON1_REG |= UDC_PULLUP_EN; | 1268 | UDC_SYSCON1_REG |= UDC_PULLUP_EN; |
1271 | if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) | 1269 | if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx()) |
1272 | OTG_CTRL_REG |= OTG_BSESSVLD; | 1270 | OTG_CTRL_REG |= OTG_BSESSVLD; |
@@ -3061,8 +3059,6 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message) | |||
3061 | omap_pullup(&udc->gadget, 0); | 3059 | omap_pullup(&udc->gadget, 0); |
3062 | } | 3060 | } |
3063 | 3061 | ||
3064 | udc->gadget.dev.power.power_state = PMSG_SUSPEND; | ||
3065 | udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND; | ||
3066 | return 0; | 3062 | return 0; |
3067 | } | 3063 | } |
3068 | 3064 | ||