Commit 5cf86349 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman
Browse files

usb: core: hcd: Modularize HCD stop configuration in usb_stop_hcd() 



No functional change. Since configuration to stop HCD is invoked from
multiple places, group all of them in usb_stop_hcd().

Tested-by: default avatarChris Chiu <chris.chiu@canonical.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Link: https://lore.kernel.org/r/20210909064200.16216-4-kishon@ti.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7a0a792

drivers/usb/core/hcd.c

+22 −17
Original line number Diff line number Diff line
@@ -2760,6 +2760,26 @@ static void usb_put_invalidate_rhdev(struct usb_hcd *hcd) 
	usb_put_dev(rhdev);

}



/**

 * usb_stop_hcd - Halt the HCD

 * @hcd: the usb_hcd that has to be halted

 *

 * Stop the root-hub polling timer and invoke the HCD's ->stop callback.

 */

static void usb_stop_hcd(struct usb_hcd *hcd)

{

	hcd->rh_pollable = 0;

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);



	hcd->driver->stop(hcd);

	hcd->state = HC_STATE_HALT;



	/* In case the HCD restarted the timer, stop it again. */

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

}



/**

 * usb_add_hcd - finish generic HCD structure initialization and register

 * @hcd: the usb_hcd structure to initialize
@@ -2960,13 +2980,7 @@ int usb_add_hcd(struct usb_hcd *hcd, 
	return retval;



err_register_root_hub:

	hcd->rh_pollable = 0;

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

	hcd->driver->stop(hcd);

	hcd->state = HC_STATE_HALT;

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

	usb_stop_hcd(hcd);

err_hcd_driver_start:

	if (usb_hcd_is_primary_hcd(hcd) && hcd->irq > 0)

		free_irq(irqnum, hcd);
@@ -3039,16 +3053,7 @@ void usb_remove_hcd(struct usb_hcd *hcd) 
	 * interrupt occurs), but usb_hcd_poll_rh_status() won't invoke

	 * the hub_status_data() callback.

	 */

	hcd->rh_pollable = 0;

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);



	hcd->driver->stop(hcd);

	hcd->state = HC_STATE_HALT;



	/* In case the HCD restarted the timer, stop it again. */

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

	usb_stop_hcd(hcd);



	if (usb_hcd_is_primary_hcd(hcd)) {

		if (hcd->irq > 0)