[src/nick-nhusb]: src/sys Simplify *_XFER2SC using ux_bus

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9246af64692f
branches:  nick-nhusb
changeset: 334281:9246af64692f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 22 11:15:42 2015 +0000

description:
Simplify *_XFER2SC using ux_bus

diffstat:

 sys/arch/mips/adm5120/dev/ahci.c    |  6 +++---
 sys/dev/ic/sl811hs.c                |  6 +++---
 sys/dev/usb/ehcivar.h               |  4 ++--
 sys/dev/usb/motgvar.h               |  4 ++--
 sys/dev/usb/ohcivar.h               |  4 ++--
 sys/dev/usb/uhcivar.h               |  4 ++--
 sys/dev/usb/xhcivar.h               |  4 ++--
 sys/external/bsd/dwc2/dwc2var.h     |  4 ++--
 sys/rump/dev/lib/libugenhc/ugenhc.c |  6 +++---
 9 files changed, 21 insertions(+), 21 deletions(-)

diffs (189 lines):

diff -r 4eea5dbcac61 -r 9246af64692f sys/arch/mips/adm5120/dev/ahci.c
--- a/sys/arch/mips/adm5120/dev/ahci.c  Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/arch/mips/adm5120/dev/ahci.c  Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahci.c,v 1.12.6.14 2015/10/20 15:31:21 skrll Exp $     */
+/*     $NetBSD: ahci.c,v 1.12.6.15 2015/10/22 11:15:42 skrll Exp $     */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.14 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.15 2015/10/22 11:15:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -411,7 +411,7 @@
 
 #define AHCI_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define AHCI_PIPE2SC(pipe)     AHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define AHCI_XFER2SC(xfer)     AHCI_PIPE2SC((xfer)->ux_pipe)
+#define AHCI_XFER2SC(xfer)     AHCI_BUS2SC((xfer)->ux_bus)
 #define AHCI_APIPE2SC(ap)      AHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
 
 /*
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c      Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/ic/sl811hs.c      Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sl811hs.c,v 1.47.6.14 2015/10/20 15:31:21 skrll Exp $  */
+/*     $NetBSD: sl811hs.c,v 1.47.6.15 2015/10/22 11:15:42 skrll Exp $  */
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.14 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.47.6.15 2015/10/22 11:15:42 skrll Exp $");
 
 #include "opt_slhci.h"
 
@@ -294,7 +294,7 @@
 
 #define SLHCI_BUS2SC(bus)      ((bus)->ub_hcpriv)
 #define SLHCI_PIPE2SC(pipe)    SLHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define SLHCI_XFER2SC(xfer)    SLHCI_PIPE2SC((xfer)->ux_pipe)
+#define SLHCI_XFER2SC(xfer)    SLHCI_BUS2SC((xfer)->ux_bus)
 
 #define SLHCI_PIPE2SPIPE(pipe) ((struct slhci_pipe *)(pipe))
 
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/usb/ehcivar.h
--- a/sys/dev/usb/ehcivar.h     Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/usb/ehcivar.h     Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehcivar.h,v 1.42.14.18 2015/10/20 08:33:17 skrll Exp $ */
+/*     $NetBSD: ehcivar.h,v 1.42.14.19 2015/10/22 11:15:42 skrll Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
 
 #define EHCI_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define EHCI_PIPE2SC(pipe)     EHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define EHCI_XFER2SC(xfer)     EHCI_PIPE2SC((xfer)->ux_pipe)
+#define EHCI_XFER2SC(xfer)     EHCI_BUS2SC((xfer)->ux_bus)
 #define EHCI_EPIPE2SC(epipe)   EHCI_BUS2SC((epipe)->pipe.up_dev->ud_bus)
 
 #define EHCI_XFER2EXFER(xfer)  ((struct ehci_xfer *)(xfer))
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/usb/motgvar.h
--- a/sys/dev/usb/motgvar.h     Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/usb/motgvar.h     Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: motgvar.h,v 1.4.2.7 2015/10/20 15:31:21 skrll Exp $    */
+/*     $NetBSD: motgvar.h,v 1.4.2.8 2015/10/22 11:15:42 skrll Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
 
 #define MOTG_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define MOTG_PIPE2SC(pipe)     MOTG_BUS2SC((pipe)->up_dev->ud_bus)
-#define MOTG_XFER2SC(xfer)     MOTG_PIPE2SC((xfer)->ux_pipe)
+#define MOTG_XFER2SC(xfer)     MOTG_BUS2SC((xfer)->ux_bus)
 #define MOTG_OTGPIPE2SC(mpipe) MOTG_BUS2SC((mpipe)->pipe.up_dev->ud_bus)
 
 #define MOTG_XFER2MXFER(xfer)  ((struct motg_xfer *)(xfer))
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/usb/ohcivar.h
--- a/sys/dev/usb/ohcivar.h     Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/usb/ohcivar.h     Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohcivar.h,v 1.55.6.7 2015/10/20 15:31:21 skrll Exp $   */
+/*     $NetBSD: ohcivar.h,v 1.55.6.8 2015/10/22 11:15:42 skrll Exp $   */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
 
 #define OHCI_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define OHCI_PIPE2SC(pipe)     OHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define OHCI_XFER2SC(xfer)     OHCI_PIPE2SC((xfer)->ux_pipe)
+#define OHCI_XFER2SC(xfer)     OHCI_BUS2SC((xfer)->ux_bus)
 
 #define OHCI_XFER2OXFER(xfer)  ((struct ohci_xfer *)(xfer))
 #define OHCI_PIPE2OPIPE(pipe)  ((struct ohci_pipe *)(pipe))
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/usb/uhcivar.h
--- a/sys/dev/usb/uhcivar.h     Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/usb/uhcivar.h     Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhcivar.h,v 1.52.14.8 2015/10/20 15:31:21 skrll Exp $  */
+/*     $NetBSD: uhcivar.h,v 1.52.14.9 2015/10/22 11:15:42 skrll Exp $  */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
 
 #define UHCI_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define UHCI_PIPE2SC(pipe)     UHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define UHCI_XFER2SC(xfer)     UHCI_PIPE2SC((xfer)->ux_pipe)
+#define UHCI_XFER2SC(xfer)     UHCI_BUS2SC((xfer)->ux_bus)
 #define UHCI_UPIPE2SC(d)       UHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
 
 #define UHCI_XFER2UXFER(xfer)  ((struct uhci_xfer *)(xfer))
diff -r 4eea5dbcac61 -r 9246af64692f sys/dev/usb/xhcivar.h
--- a/sys/dev/usb/xhcivar.h     Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/dev/usb/xhcivar.h     Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhcivar.h,v 1.4.12.6 2015/10/20 15:31:21 skrll Exp $   */
+/*     $NetBSD: xhcivar.h,v 1.4.12.7 2015/10/22 11:15:42 skrll Exp $   */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -41,7 +41,7 @@
 
 #define XHCI_BUS2SC(bus)       ((bus)->ub_hcpriv)
 #define XHCI_PIPE2SC(pipe)     XHCI_BUS2SC((pipe)->up_dev->ud_bus)
-#define XHCI_XFER2SC(xfer)     XHCI_PIPE2SC((xfer)->ux_pipe)
+#define XHCI_XFER2SC(xfer)     XHCI_BUS2SC((xfer)->ux_bus)
 #define XHCI_XPIPE2SC(d)       XHCI_BUS2SC((d)->pipe.up_dev->ud_bus)
 
 #define XHCI_XFER2XXFER(xfer)  ((struct xhci_xfer *)(xfer))
diff -r 4eea5dbcac61 -r 9246af64692f sys/external/bsd/dwc2/dwc2var.h
--- a/sys/external/bsd/dwc2/dwc2var.h   Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/external/bsd/dwc2/dwc2var.h   Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2var.h,v 1.3.12.6 2015/10/11 09:17:51 skrll Exp $   */
+/*     $NetBSD: dwc2var.h,v 1.3.12.7 2015/10/22 11:15:42 skrll Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
 
 #define        DWC2_BUS2SC(bus)        ((bus)->ub_hcpriv)
 #define        DWC2_PIPE2SC(pipe)      DWC2_BUS2SC((pipe)->up_dev->ud_bus)
-#define        DWC2_XFER2SC(xfer)      DWC2_PIPE2SC((xfer)->ux_pipe)
+#define        DWC2_XFER2SC(xfer)      DWC2_BUS2SC((xfer)->ux_bus)
 #define        DWC2_DPIPE2SC(d)        DWC2_BUS2SC((d)->pipe.up_dev->ud_bus)
 
 #define        DWC2_XFER2DXFER(x)      (struct dwc2_xfer *)(x)
diff -r 4eea5dbcac61 -r 9246af64692f sys/rump/dev/lib/libugenhc/ugenhc.c
--- a/sys/rump/dev/lib/libugenhc/ugenhc.c       Wed Oct 21 21:36:08 2015 +0000
+++ b/sys/rump/dev/lib/libugenhc/ugenhc.c       Thu Oct 22 11:15:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ugenhc.c,v 1.22.4.11 2015/10/20 15:31:21 skrll Exp $   */
+/*     $NetBSD: ugenhc.c,v 1.22.4.12 2015/10/22 11:15:42 skrll Exp $   */
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.11 2015/10/20 15:31:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.22.4.12 2015/10/22 11:15:42 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -120,7 +120,7 @@
 
 #define UGENHC_BUS2SC(bus)     ((bus)->ub_hcpriv)
 #define UGENHC_PIPE2SC(pipe)   UGENHC_BUS2SC((pipe)->up_dev->ud_bus)
-#define UGENHC_XFER2SC(pipe)   UGENHC_PIPE2SC((xfer)->ux_pipe)
+#define UGENHC_XFER2SC(pipe)   UGENHC_BUS2SC((xfer)->ux_bus)
 
 #define UGENDEV_BASESTR "/dev/ugen"
 #define UGENDEV_BUFSIZE 32