These patches are against kernels 2.6.18 through at least 2.6.18-git7.
patch 6: Continue untangling ehci_iso_sched and sitd code. Remove
ifdefs and code for EHCI_URB_TRACE within ehci-sched in preference for
later additional debugging information tailored to the new code.
Aside from removal of unused ifdefs, this patch results in no
functional difference.
Signed-off-by: Christopher "Monty" Montgomery <[EMAIL PROTECTED]>
---
diff -X b/Documentation/dontdiff -upr a/drivers/usb/host/ehci-sched.c
b/drivers/usb/host/ehci-sched.c
--- a/drivers/usb/host/ehci-sched.c 2006-09-26 22:22:18.000000000 -0400
+++ b/drivers/usb/host/ehci-sched.c 2006-09-26 22:22:28.000000000 -0400
@@ -1864,17 +1864,6 @@ static int itd_submit (struct ehci_hcd *
goto done;
}
-#ifdef EHCI_URB_TRACE
- ehci_dbg (ehci,
- "%s %s urb %p ep%d%s len %d, %d pkts %d uframes [%p]\n",
- __FUNCTION__, urb->dev->devpath, urb,
- usb_pipeendpoint (urb->pipe),
- usb_pipein (urb->pipe) ? "in" : "out",
- urb->transfer_buffer_length,
- urb->number_of_packets, urb->interval,
- stream);
-#endif
-
/* allocate ITDs w/o locking anything */
status = itd_urb_transaction (stream, ehci, urb, mem_flags);
if (unlikely (status < 0)) {
@@ -1899,8 +1888,6 @@ done:
return status;
}
-#ifdef CONFIG_USB_EHCI_SPLIT_ISO
-
/*-------------------------------------------------------------------------*/
/* Split-ISO transfer machinery; used for FS isoch transfers through the
* TTs in USB 2.0 hubs. */
@@ -2271,15 +2258,6 @@ static int sitd_submit (struct ehci_hcd
goto done;
}
-#ifdef EHCI_URB_TRACE
- ehci_dbg (ehci,
- "submit %p dev%s ep%d%s-iso len %d\n",
- urb, urb->dev->devpath,
- usb_pipeendpoint (urb->pipe),
- usb_pipein (urb->pipe) ? "in" : "out",
- urb->transfer_buffer_length);
-#endif
-
/* allocate SITDs */
status = sitd_urb_transaction (stream, ehci, urb, mem_flags);
if (status < 0) {
@@ -2304,27 +2282,6 @@ done:
return status;
}
-#else
-
-static inline int
-sitd_submit (struct ehci_hcd *ehci, struct urb *urb, gfp_t mem_flags)
-{
- ehci_dbg (ehci, "split iso support is disabled\n");
- return -ENOSYS;
-}
-
-static inline unsigned
-sitd_complete (
- struct ehci_hcd *ehci,
- struct ehci_sitd *sitd,
- struct pt_regs *regs
-) {
- ehci_err (ehci, "sitd_complete %p?\n", sitd);
- return 0;
-}
-
-#endif /* USB_EHCI_SPLIT_ISO */
-
/* scan_periodic - completion worker; called out of interrupt (or
* poll) handler to finish processing of transactions that have been
* completed by the host controller. Also now has the responsibility
diff -X b/Documentation/dontdiff -upr a/drivers/usb/host/Kconfig
b/drivers/usb/host/Kconfig
--- a/drivers/usb/host/Kconfig 2006-08-09 22:12:43.000000000 -0400
+++ b/drivers/usb/host/Kconfig 2006-09-26 22:22:28.000000000 -0400
@@ -29,15 +29,6 @@ config USB_EHCI_HCD
To compile this driver as a module, choose M here: the
module will be called ehci-hcd.
-config USB_EHCI_SPLIT_ISO
- bool "Full speed ISO transactions (EXPERIMENTAL)"
- depends on USB_EHCI_HCD && EXPERIMENTAL
- default n
- ---help---
- This code is new and hasn't been used with many different
- EHCI or USB 2.0 transaction translator implementations.
- It should work for ISO-OUT transfers, like audio.
-
config USB_EHCI_ROOT_HUB_TT
bool "Root Hub Transaction Translators (EXPERIMENTAL)"
depends on USB_EHCI_HCD && EXPERIMENTAL
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
