CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Tue Oct 27 08:02:31 UTC 2015

Modified Files:
        src/sys/dev/usb [nick-nhusb]: uhci.c uhcivar.h

Log Message:
Remove barely used softc copy in uhci_intr_info_t


To generate a diff of this commit:
cvs rdiff -u -r1.264.4.37 -r1.264.4.38 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.52.14.9 -r1.52.14.10 src/sys/dev/usb/uhcivar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.37 src/sys/dev/usb/uhci.c:1.264.4.38
--- src/sys/dev/usb/uhci.c:1.264.4.37	Tue Oct 20 15:31:21 2015
+++ src/sys/dev/usb/uhci.c	Tue Oct 27 08:02:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.264.4.37 2015/10/20 15:31:21 skrll Exp $	*/
+/*	$NetBSD: uhci.c,v 1.264.4.38 2015/10/27 08:02:31 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.37 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.38 2015/10/27 08:02:31 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -624,7 +624,6 @@ uhci_allocx(struct usbd_bus *bus, unsign
 		memset(xfer, 0, sizeof(struct uhci_xfer));
 
 		struct uhci_xfer *uxfer = UHCI_XFER2UXFER(xfer);
-		uxfer->iinfo.sc = sc;
 #ifdef DIAGNOSTIC
 		uxfer->iinfo.isdone = true;
 		xfer->ux_state = XFER_BUSY;
@@ -3011,7 +3010,7 @@ void
 uhci_device_intr_done(struct usbd_xfer *xfer)
 {
 	uhci_intr_info_t *ii = &UHCI_XFER2UXFER(xfer)->iinfo;
-	uhci_softc_t *sc = ii->sc;
+	uhci_softc_t *sc = UHCI_XFER2SC(xfer);
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->ux_pipe;
 	uhci_soft_qh_t *sqh;
 	int i, npoll, isread;
@@ -3091,7 +3090,7 @@ void
 uhci_device_ctrl_done(struct usbd_xfer *xfer)
 {
 	uhci_intr_info_t *ii = &UHCI_XFER2UXFER(xfer)->iinfo;
-	uhci_softc_t *sc = ii->sc;
+	uhci_softc_t *sc = UHCI_XFER2SC(xfer);
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->ux_pipe;
 	int len = UGETW(xfer->ux_request.wLength);
 	int isread = (xfer->ux_request.bmRequestType & UT_READ);
@@ -3130,7 +3129,7 @@ void
 uhci_device_bulk_done(struct usbd_xfer *xfer)
 {
 	uhci_intr_info_t *ii = &UHCI_XFER2UXFER(xfer)->iinfo;
-	uhci_softc_t *sc = ii->sc;
+	uhci_softc_t *sc = UHCI_XFER2SC(xfer);
 	struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->ux_pipe;
 
 	UHCIHIST_FUNC(); UHCIHIST_CALLED();

Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.52.14.9 src/sys/dev/usb/uhcivar.h:1.52.14.10
--- src/sys/dev/usb/uhcivar.h:1.52.14.9	Thu Oct 22 11:15:42 2015
+++ src/sys/dev/usb/uhcivar.h	Tue Oct 27 08:02:31 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhcivar.h,v 1.52.14.9 2015/10/22 11:15:42 skrll Exp $	*/
+/*	$NetBSD: uhcivar.h,v 1.52.14.10 2015/10/27 08:02:31 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,6 @@ typedef union {
  * searched at interrupt time.
  */
 typedef struct uhci_intr_info {
-	struct uhci_softc *sc;
 	struct usbd_xfer *xfer;
 	uhci_soft_td_t *stdstart;
 	uhci_soft_td_t *stdend;