[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>

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index c039d2fbe7ab950ea092e6a853869fc32c760162..9d37fc771b279de04abb3381a301d8f733de6007 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1646,6 +1646,9 @@ static int dummy_start (struct usb_hcd *hcd)
        if (!root)
                return -ENOMEM;
 
+       /* only show a low-power port: just 8mA */
+       hcd->power_budget = 8;
+
        /* root hub enters addressed state... */
        hcd->state = HC_STATE_RUNNING;
        root->speed = USB_SPEED_HIGH;
@@ -1655,9 +1658,6 @@ static int dummy_start (struct usb_hcd *hcd)
                goto err1;
        }
 
-       /* only show a low-power port: just 8mA */
-       hub_set_power_budget (root, 8);
-
        if ((retval = dummy_register_udc (dum)) != 0)
                goto err2;
 

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 32120042ab658265ab8abf9e098b0c318bd3081c..0da996191251509a9beb2287e2bf8a4f0e77b709 100644 (file)
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -699,8 +699,6 @@ retry:
                ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
                return -ENODEV;
        }
-       if (ohci->power_budget)
-               hub_set_power_budget(udev, ohci->power_budget);
 
        register_reboot_notifier (&ohci->reboot_notifier);
        create_debug_files (ohci);

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 8aab5907afe9ad442012ec4c00aecd46dd88c50b..b62d69937694891b50746a7398141bd99d10d25b 100644 (file)
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -181,7 +181,7 @@ static int omap_start_hc(struct ohci_hcd *ohci, struct platform_device *pdev)
        if (config->otg) {
                ohci_to_hcd(ohci)->self.otg_port = config->otg;
                /* default/minimum OTG power budget:  8 mA */
-               ohci->power_budget = 8;
+               ohci_to_hcd(ohci)->power_budget = 8;
        }
 
        /* boards can use OTG transceivers in non-OTG modes */
@@ -230,7 +230,7 @@ static int omap_start_hc(struct ohci_hcd *ohci, struct platform_device *pdev)
 
                /* TPS2045 switch for internal transceiver (port 1) */
                if (machine_is_omap_osk()) {
-                       ohci->power_budget = 250;
+                       ohci_to_hcd(ohci)->power_budget = 250;
 
                        rh &= ~RH_A_NOCP;
 

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 3dbc7c0eed43c38a28036bb137c91595f12b18ca..71cdd2262860d129fc1776179b561f3f0ff5dcb4 100644 (file)
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -371,7 +371,6 @@ struct ohci_hcd {
         * other external transceivers should be software-transparent 
         */
        struct otg_transceiver  *transceiver;
-       unsigned                power_budget;
 
        /*
         * memory management for queue data structures

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 99d43f758ad0e85d524d00cedaf93bed8793ac15..1f2d00fe983a486077487f344059673bfaa77e0d 100644 (file)
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1574,8 +1574,10 @@ sl811h_start(struct usb_hcd *hcd)
        udev->speed = USB_SPEED_FULL;
        hcd->state = HC_STATE_RUNNING;
 
-       if (sl811->board)
+       if (sl811->board) {
                hcd->can_wakeup = sl811->board->can_wakeup;
+               hcd->power_budget = sl811->board->power * 2;
+       }
 
        if (usb_hcd_register_root_hub(udev, hcd) != 0) {
                usb_put_dev(udev);
@@ -1583,9 +1585,6 @@ sl811h_start(struct usb_hcd *hcd)
                return -ENODEV;
        }
 
-       if (sl811->board && sl811->board->power)
-               hub_set_power_budget(udev, sl811->board->power * 2);
-
        /* enable power and interupts */
        port_power(sl811, 1);