Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc96c0ad authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

[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: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2532178a

drivers/usb/gadget/dummy_hcd.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/ohci-hcd.c

+0 −2
Original line number Diff line number Diff line
@@ -699,8 +699,6 @@ static int ohci_run (struct ohci_hcd *ohci) 
		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);

drivers/usb/host/ohci-omap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/ohci.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/usb/host/sl811-hcd.c

+3 −4
Original line number Diff line number Diff line
@@ -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);