[src/trunk]: src/sys/dev/ic Fix SLHCI_XFER_TYPE

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

details:   https://anonhg.NetBSD.org/src/rev/1e2b96f255ee
branches:  trunk
changeset: 344892:1e2b96f255ee
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Apr 26 10:28:28 2016 +0000

description:
Fix SLHCI_XFER_TYPE

diffstat:

 sys/dev/ic/sl811hs.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r b74663f849e6 -r 1e2b96f255ee sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c      Tue Apr 26 10:10:27 2016 +0000
+++ b/sys/dev/ic/sl811hs.c      Tue Apr 26 10:28:28 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sl811hs.c,v 1.54 2016/04/26 10:10:27 skrll Exp $       */
+/*     $NetBSD: sl811hs.c,v 1.55 2016/04/26 10:28:28 skrll Exp $       */
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.54 2016/04/26 10:10:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.55 2016/04/26 10:28:28 skrll Exp $");
 
 #include "opt_slhci.h"
 
@@ -168,8 +168,6 @@
 }
 #endif
 
-#define SLHCI_XFER_TYPE(x) (((struct slhci_pipe *)((x)->pipe))->ptype)
-
 /*
  * Maximum allowable reserved bus time.  Since intr/isoc transfers have
  * unconditional priority, this is all that ensures control and bulk transfers
@@ -296,6 +294,9 @@
 #define SLHCI_XFER2SC(xfer)    SLHCI_BUS2SC((xfer)->ux_bus)
 
 #define SLHCI_PIPE2SPIPE(pipe) ((struct slhci_pipe *)(pipe))
+#define SLHCI_XFER2SPIPE(xfer) SLHCI_PIPE2SPIPE((xfer)->ux_pipe)
+
+#define SLHCI_XFER_TYPE(x)     (SLHCI_XFER2SPIPE(xfer)->ptype)
 
 #ifdef SLHCI_PROFILE_TRANSFER
 #if defined(__mips__)