diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2005-04-25 11:21:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-27 17:43:49 -0400 |
commit | bc96c0ad1ed0c938fefc0423aa99f086c5a2a1ea (patch) | |
tree | 8283e540734b08d537dedf044f28c65a5ae64d63 /drivers/usb/host/sl811-hcd.c | |
parent | 2532178a68b5ce4e421d50ea1b1dcc0a1359f19d (diff) |
[PATCH] ohci-omap, sl811, dummy: remove hub_set_power_budget
This patch changes the HCDs that used the old hub_set_power_budget call,
making them use the new hcd->power_budget field instead.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/sl811-hcd.c')
-rw-r--r-- | drivers/usb/host/sl811-hcd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 99d43f758ad0..1f2d00fe983a 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1574,8 +1574,10 @@ sl811h_start(struct usb_hcd *hcd) | |||
1574 | udev->speed = USB_SPEED_FULL; | 1574 | udev->speed = USB_SPEED_FULL; |
1575 | hcd->state = HC_STATE_RUNNING; | 1575 | hcd->state = HC_STATE_RUNNING; |
1576 | 1576 | ||
1577 | if (sl811->board) | 1577 | if (sl811->board) { |
1578 | hcd->can_wakeup = sl811->board->can_wakeup; | 1578 | hcd->can_wakeup = sl811->board->can_wakeup; |
1579 | hcd->power_budget = sl811->board->power * 2; | ||
1580 | } | ||
1579 | 1581 | ||
1580 | if (usb_hcd_register_root_hub(udev, hcd) != 0) { | 1582 | if (usb_hcd_register_root_hub(udev, hcd) != 0) { |
1581 | usb_put_dev(udev); | 1583 | usb_put_dev(udev); |
@@ -1583,9 +1585,6 @@ sl811h_start(struct usb_hcd *hcd) | |||
1583 | return -ENODEV; | 1585 | return -ENODEV; |
1584 | } | 1586 | } |
1585 | 1587 | ||
1586 | if (sl811->board && sl811->board->power) | ||
1587 | hub_set_power_budget(udev, sl811->board->power * 2); | ||
1588 | |||
1589 | /* enable power and interupts */ | 1588 | /* enable power and interupts */ |
1590 | port_power(sl811, 1); | 1589 | port_power(sl811, 1); |
1591 | 1590 | ||