summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2016-04-26 10:28:28 +0000
committerskrll <skrll@NetBSD.org>2016-04-26 10:28:28 +0000
commit930aa594d542fcc30173a862826aa85e75302356 (patch)
treef0b201a53f892572ee4acbc32cccf17134daea99 /sys/dev
parentb941e2942047c16fb2adc402741c5671cf514515 (diff)
Fix SLHCI_XFER_TYPE
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/sl811hs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c
index 937cb686982..6e5081f08b5 100644
--- a/sys/dev/ic/sl811hs.c
+++ b/sys/dev/ic/sl811hs.c
@@ -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 @@ pnames(int ptype)
}
#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 @@ struct slhci_pipe {
#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__)