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

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

USB: EHCI: Make timer_action out-of-line 



This patch (as1205) moves timer_action() from ehci.h to ehci-hcd.c and
makes it out-of-line.  Over the years it has grown too big to be inline
any more.

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 b967c88e

drivers/usb/host/ehci-hcd.c

+36 −0
Original line number Diff line number Diff line
@@ -110,6 +110,42 @@ MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications"); 


/*-------------------------------------------------------------------------*/



static void

timer_action(struct ehci_hcd *ehci, enum ehci_timer_action action)

{

	/* Don't override timeouts which shrink or (later) disable

	 * the async ring; just the I/O watchdog.  Note that if a

	 * SHRINK were pending, OFF would never be requested.

	 */

	if (timer_pending(&ehci->watchdog)

			&& ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))

				& ehci->actions))

		return;



	if (!test_and_set_bit(action, &ehci->actions)) {

		unsigned long t;



		switch (action) {

		case TIMER_IO_WATCHDOG:

			t = EHCI_IO_JIFFIES;

			break;

		case TIMER_ASYNC_OFF:

			t = EHCI_ASYNC_JIFFIES;

			break;

		/* case TIMER_ASYNC_SHRINK: */

		default:

			/* add a jiffie since we synch against the

			 * 8 KHz uframe counter.

			 */

			t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;

			break;

		}

		mod_timer(&ehci->watchdog, t + jiffies);

	}

}



/*-------------------------------------------------------------------------*/



/*

 * handshake - spin reading hc until handshake completes or fails

 * @ptr: address of hc register to be read

drivers/usb/host/ehci.h

+0 −34
Original line number Diff line number Diff line
@@ -190,40 +190,6 @@ timer_action_done (struct ehci_hcd *ehci, enum ehci_timer_action action) 
	clear_bit (action, &ehci->actions);

}



static inline void

timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)

{

	/* Don't override timeouts which shrink or (later) disable

	 * the async ring; just the I/O watchdog.  Note that if a

	 * SHRINK were pending, OFF would never be requested.

	 */

	if (timer_pending(&ehci->watchdog)

			&& ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))

				& ehci->actions))

		return;



	if (!test_and_set_bit (action, &ehci->actions)) {

		unsigned long t;



		switch (action) {

		case TIMER_IO_WATCHDOG:

			t = EHCI_IO_JIFFIES;

			break;

		case TIMER_ASYNC_OFF:

			t = EHCI_ASYNC_JIFFIES;

			break;

		// case TIMER_ASYNC_SHRINK:

		default:

			/* add a jiffie since we synch against the

			 * 8 KHz uframe counter.

			 */

			t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;

			break;

		}

		mod_timer(&ehci->watchdog, t + jiffies);

	}

}



static void free_cached_itd_list(struct ehci_hcd *ehci);



/*-------------------------------------------------------------------------*/