From 483c6192ecb5799fc98ed7b128132da6987e24c9 Mon Sep 17 00:00:00 2001
From: Lukas Ertl <le@FreeBSD.org>
Date: Mon, 19 Jul 2004 20:47:46 +0000
Subject: [PATCH] Diff reduction to NetBSD.

ehci.c rev. 1.69, author: mycroft
uhci.c rev. 1.179, author: mycroft
   hcpriv is not actually used here.  Remove references to it.

Obtained from:   NetBSD
---
 sys/dev/usb/ehci.c | 3 +--
 sys/dev/usb/uhci.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index eb034f5d7b58..327f1ed30c90 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -8,6 +8,7 @@
  *	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $
  *	$NetBSD: ehci.c,v 1.67 2004/07/06 04:18:05 mycroft Exp $
  *	$NetBSD: ehci.c,v 1.68 2004/07/09 05:07:06 mycroft Exp $
+ *	$NetBSD: ehci.c,v 1.69 2004/07/17 20:12:02 mycroft Exp $
  */
 
 /*
@@ -1976,7 +1977,6 @@ ehci_root_ctrl_close(usbd_pipe_handle pipe)
 void
 ehci_root_intr_done(usbd_xfer_handle xfer)
 {
-	xfer->hcpriv = NULL;
 }
 
 Static usbd_status
@@ -2037,7 +2037,6 @@ ehci_root_intr_close(usbd_pipe_handle pipe)
 void
 ehci_root_ctrl_done(usbd_xfer_handle xfer)
 {
-	xfer->hcpriv = NULL;
 }
 
 /************************/
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 0fffd214d8dc..5aab5194066f 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -7,6 +7,7 @@
  *	$NetBSD: uhci.c,v 1.176 2003/11/04 19:11:21 mycroft Exp $
  *	$NetBSD: uhci.c,v 1.177 2003/12/29 08:17:10 toshii Exp $
  *	$NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $
+ *	$NetBSD: uhci.c,v 1.180 2004/07/17 20:12:03 mycroft Exp $
  */
 
 #include <sys/cdefs.h>
@@ -1973,8 +1974,6 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
 	/*
 	 * Step 3: Execute callback.
 	 */
-	xfer->hcpriv = ii;
-
 	DPRINTFN(1,("uhci_abort_xfer: callback\n"));
 	s = splusb();
 #ifdef DIAGNOSTIC