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

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Tue Oct 20 15:17:54 UTC 2015

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

Log Message:
g/c some unused stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.12.2.19 -r1.12.2.20 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.4.2.5 -r1.4.2.6 src/sys/dev/usb/motgvar.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/motg.c
diff -u src/sys/dev/usb/motg.c:1.12.2.19 src/sys/dev/usb/motg.c:1.12.2.20
--- src/sys/dev/usb/motg.c:1.12.2.19	Sun Oct 11 09:17:51 2015
+++ src/sys/dev/usb/motg.c	Tue Oct 20 15:17:54 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: motg.c,v 1.12.2.19 2015/10/11 09:17:51 skrll Exp $	*/
+/*	$NetBSD: motg.c,v 1.12.2.20 2015/10/20 15:17:54 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 #include "opt_motg.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.19 2015/10/11 09:17:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.20 2015/10/20 15:17:54 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -754,9 +754,7 @@ motg_allocx(struct usbd_bus *bus, unsign
 	xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
 	if (xfer != NULL) {
 		memset(xfer, 0, sizeof(struct motg_xfer));
-		UXFER(xfer)->sc = sc;
 #ifdef DIAGNOSTIC
-		// XXX UXFER(xfer)->iinfo.isdone = 1;
 		xfer->ux_state = XFER_BUSY;
 #endif
 	}
@@ -1003,9 +1001,6 @@ motg_root_intr_abort(struct usbd_xfer *x
 
 	sc->sc_intr_xfer = NULL;
 
-#ifdef DIAGNOSTIC
-	// XXX UXFER(xfer)->iinfo.isdone = 1;
-#endif
 	xfer->ux_status = USBD_CANCELLED;
 	usb_transfer_complete(xfer);
 }

Index: src/sys/dev/usb/motgvar.h
diff -u src/sys/dev/usb/motgvar.h:1.4.2.5 src/sys/dev/usb/motgvar.h:1.4.2.6
--- src/sys/dev/usb/motgvar.h:1.4.2.5	Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/motgvar.h	Tue Oct 20 15:17:54 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: motgvar.h,v 1.4.2.5 2015/03/19 17:26:43 skrll Exp $	*/
+/*	$NetBSD: motgvar.h,v 1.4.2.6 2015/10/20 15:17:54 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -111,12 +111,8 @@ struct motg_softc {
 
 struct motg_xfer {
 	struct usbd_xfer xfer;
-	struct motg_softc *sc;
 };
 
-#define UXFER(xfer) ((struct motg_xfer *)(xfer))
-
-
 int		motg_init(struct motg_softc *);
 int		motg_intr(struct motg_softc *, uint16_t, uint16_t, uint8_t);
 int		motg_intr_vbus(struct motg_softc *, int);