Module Name: src
Committed By: skrll
Date: Fri Nov 17 08:22:03 UTC 2017
Modified Files:
src/sys/dev/usb: ehci.c motg.c ohci.c uhci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
s/PR_NOWAIT/PR_WAITOK/ in HCD allocx (allocate xfer) method
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.275 -r1.276 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.278 -r1.279 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.46 -r1.47 src/sys/external/bsd/dwc2/dwc2.c
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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.256 src/sys/dev/usb/ehci.c:1.257
--- src/sys/dev/usb/ehci.c:1.256 Sat Oct 28 00:37:12 2017
+++ src/sys/dev/usb/ehci.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.256 2017/10/28 00:37:12 pgoyette Exp $ */
+/* $NetBSD: ehci.c,v 1.257 2017/11/17 08:22:02 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.256 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.257 2017/11/17 08:22:02 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1516,7 +1516,7 @@ ehci_allocx(struct usbd_bus *bus, unsign
struct ehci_softc *sc = EHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct ehci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.18 src/sys/dev/usb/motg.c:1.19
--- src/sys/dev/usb/motg.c:1.18 Sat Oct 28 00:37:12 2017
+++ src/sys/dev/usb/motg.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.18 2017/10/28 00:37:12 pgoyette Exp $ */
+/* $NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.18 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.19 2017/11/17 08:22:02 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_motg.h"
@@ -752,7 +752,7 @@ motg_allocx(struct usbd_bus *bus, unsign
struct motg_softc *sc = MOTG_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct motg_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.275 src/sys/dev/usb/ohci.c:1.276
--- src/sys/dev/usb/ohci.c:1.275 Sat Oct 28 07:36:02 2017
+++ src/sys/dev/usb/ohci.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.275 2017/10/28 07:36:02 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.276 2017/11/17 08:22:02 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.275 2017/10/28 07:36:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.276 2017/11/17 08:22:02 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1069,7 +1069,7 @@ ohci_allocx(struct usbd_bus *bus, unsign
ohci_softc_t *sc = OHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct ohci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.278 src/sys/dev/usb/uhci.c:1.279
--- src/sys/dev/usb/uhci.c:1.278 Thu Nov 16 21:54:51 2017
+++ src/sys/dev/usb/uhci.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.278 2017/11/16 21:54:51 christos Exp $ */
+/* $NetBSD: uhci.c,v 1.279 2017/11/17 08:22:02 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.278 2017/11/16 21:54:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.279 2017/11/17 08:22:02 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -657,7 +657,7 @@ uhci_allocx(struct usbd_bus *bus, unsign
struct uhci_softc *sc = UHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct uhci_xfer));
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.76 src/sys/dev/usb/xhci.c:1.77
--- src/sys/dev/usb/xhci.c:1.76 Thu Nov 9 10:03:46 2017
+++ src/sys/dev/usb/xhci.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.76 2017/11/09 10:03:46 msaitoh Exp $ */
+/* $NetBSD: xhci.c,v 1.77 2017/11/17 08:22:02 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.76 2017/11/09 10:03:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.77 2017/11/17 08:22:02 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2189,7 +2189,7 @@ xhci_allocx(struct usbd_bus *bus, unsign
XHCIHIST_FUNC(); XHCIHIST_CALLED();
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct xhci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.46 src/sys/external/bsd/dwc2/dwc2.c:1.47
--- src/sys/external/bsd/dwc2/dwc2.c:1.46 Thu Jun 1 02:45:12 2017
+++ src/sys/external/bsd/dwc2/dwc2.c Fri Nov 17 08:22:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.46 2017/06/01 02:45:12 chs Exp $ */
+/* $NetBSD: dwc2.c,v 1.47 2017/11/17 08:22:02 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.46 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.47 2017/11/17 08:22:02 skrll Exp $");
#include "opt_usb.h"
@@ -207,7 +207,7 @@ dwc2_allocx(struct usbd_bus *bus, unsign
DPRINTFN(10, "\n");
DWC2_EVCNT_INCR(sc->sc_ev_xferpoolget);
- dxfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ dxfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (dxfer != NULL) {
memset(dxfer, 0, sizeof(*dxfer));
