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

Commit 3f122a99 authored by Geyslan G. Bem's avatar Geyslan G. Bem Committed by Greg Kroah-Hartman
Browse files

usb: host: ehci-sched: refactor scan_isoc function 



This patch removes an infinite 'for' loop and makes use of the already
existing 'restart' tag instead, reducing one leading tab.

The comments and code were corrected conforming file coding style.

Tested by compilation only.
Caught by checkpatch:
 WARNING: Too many leading tabs - consider code refactoring

Signed-off-by: default avatarGeyslan G. Bem <geyslan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 93df42ba

drivers/usb/host/ehci-sched.c

+101 −101
Original line number Diff line number Diff line
@@ -2382,6 +2382,8 @@ static void scan_isoc(struct ehci_hcd *ehci) 
	unsigned		uf, now_frame, frame;

	unsigned		fmask = ehci->periodic_size - 1;

	bool			modified, live;

	union ehci_shadow	q, *q_p;

	__hc32			type, *hw_p;



	/*

	 * When running, scan from last scan point up to "now"
@@ -2399,12 +2401,9 @@ static void scan_isoc(struct ehci_hcd *ehci) 
	ehci->now_frame = now_frame;



	frame = ehci->last_iso_frame;

	for (;;) {

		union ehci_shadow	q, *q_p;

		__hc32			type, *hw_p;



restart:

		/* scan each element in frame's queue for completions */

	/* Scan each element in frame's queue for completions */

	q_p = &ehci->pshadow[frame];

	hw_p = &ehci->periodic[frame];

	q.ptr = q_p->ptr;
@@ -2414,7 +2413,8 @@ static void scan_isoc(struct ehci_hcd *ehci) 
	while (q.ptr != NULL) {

		switch (hc32_to_cpu(ehci, type)) {

		case Q_TYPE_ITD:

				/* If this ITD is still active, leave it for

			/*

			 * If this ITD is still active, leave it for

			 * later processing ... check the next entry.

			 * No need to check for activity unless the

			 * frame is current.
@@ -2436,7 +2436,8 @@ static void scan_isoc(struct ehci_hcd *ehci) 
				}

			}



				/* Take finished ITDs out of the schedule

			/*

			 * Take finished ITDs out of the schedule

			 * and process them:  recycle, maybe report

			 * URB completion.  HC won't cache the

			 * pointer for much longer, if at all.
@@ -2446,15 +2447,15 @@ static void scan_isoc(struct ehci_hcd *ehci) 
					q.itd->hw_next != EHCI_LIST_END(ehci))

				*hw_p = q.itd->hw_next;

			else

					*hw_p = cpu_to_hc32(ehci,

							ehci->dummy->qh_dma);

				*hw_p = cpu_to_hc32(ehci, ehci->dummy->qh_dma);

			type = Q_NEXT_TYPE(ehci, q.itd->hw_next);

			wmb();

			modified = itd_complete(ehci, q.itd);

			q = *q_p;

			break;

		case Q_TYPE_SITD:

				/* If this SITD is still active, leave it for

			/*

			 * If this SITD is still active, leave it for

			 * later processing ... check the next entry.

			 * No need to check for activity unless the

			 * frame is current.
@@ -2462,18 +2463,17 @@ static void scan_isoc(struct ehci_hcd *ehci) 
			if (((frame == now_frame) ||

					(((frame + 1) & fmask) == now_frame))

				&& live

				    && (q.sitd->hw_results &

					SITD_ACTIVE(ehci))) {

				&& (q.sitd->hw_results & SITD_ACTIVE(ehci))) {



				q_p = &q.sitd->sitd_next;

				hw_p = &q.sitd->hw_next;

					type = Q_NEXT_TYPE(ehci,

							q.sitd->hw_next);

				type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);

				q = *q_p;

				break;

			}



				/* Take finished SITDs out of the schedule

			/*

			 * Take finished SITDs out of the schedule

			 * and process them:  recycle, maybe report

			 * URB completion.

			 */
@@ -2482,8 +2482,7 @@ static void scan_isoc(struct ehci_hcd *ehci) 
					q.sitd->hw_next != EHCI_LIST_END(ehci))

				*hw_p = q.sitd->hw_next;

			else

					*hw_p = cpu_to_hc32(ehci,

							ehci->dummy->qh_dma);

				*hw_p = cpu_to_hc32(ehci, ehci->dummy->qh_dma);

			type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);

			wmb();

			modified = sitd_complete(ehci, q.sitd);
@@ -2492,7 +2491,7 @@ static void scan_isoc(struct ehci_hcd *ehci) 
		default:

			ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n",

					type, frame, q.ptr);

				// BUG ();

			/* BUG(); */

			/* FALL THROUGH */

		case Q_TYPE_QH:

		case Q_TYPE_FSTN:
@@ -2501,17 +2500,18 @@ static void scan_isoc(struct ehci_hcd *ehci) 
			break;

		}



			/* assume completion callbacks modify the queue */

		/* Assume completion callbacks modify the queue */

		if (unlikely(modified && ehci->isoc_count > 0))

			goto restart;

	}



	/* Stop when we have reached the current frame */

	if (frame == now_frame)

			break;

		return;



	/* The last frame may still have active siTDs */

	ehci->last_iso_frame = frame;

	frame = (frame + 1) & fmask;

	}



	goto restart;

}