Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by skrll in ticket #385): 

sys/dev/usb/xhci.c: revision 1.77
	sys/external/bsd/dwc2/dwc2.c: revision 1.47
	sys/dev/usb/motg.c: revision 1.19
	sys/dev/usb/ehci.c: revision 1.257
	sys/dev/usb/ohci.c: revision 1.276
	sys/dev/usb/uhci.c: revision 1.279

s/PR_NOWAIT/PR_WAITOK/ in HCD allocx (allocate xfer) method
This commit is contained in:
martin 2017-11-23 13:29:32 +00:00
parent 3cabcbd714
commit ca56b72ee8
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/ehci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ehci.c,v 1.254.8.2 2017/11/02 21:29:52 snj Exp $ */
/* $NetBSD: ehci.c,v 1.254.8.3 2017/11/23 13:29:32 martin 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.254.8.2 2017/11/02 21:29:52 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.3 2017/11/23 13:29:32 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@ -1516,7 +1516,7 @@ ehci_allocx(struct usbd_bus *bus, unsigned int nframes)
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

6
sys/dev/usb/motg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: motg.c,v 1.17.10.1 2017/11/02 21:29:52 snj Exp $ */
/* $NetBSD: motg.c,v 1.17.10.2 2017/11/23 13:29:32 martin 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.17.10.1 2017/11/02 21:29:52 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.17.10.2 2017/11/23 13:29:32 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_motg.h"
@ -752,7 +752,7 @@ motg_allocx(struct usbd_bus *bus, unsigned int nframes)
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

6
sys/dev/usb/ohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci.c,v 1.273.6.1 2017/11/02 21:29:52 snj Exp $ */
/* $NetBSD: ohci.c,v 1.273.6.2 2017/11/23 13:29:32 martin 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.273.6.1 2017/11/02 21:29:52 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.2 2017/11/23 13:29:32 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@ -1069,7 +1069,7 @@ ohci_allocx(struct usbd_bus *bus, unsigned int nframes)
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

6
sys/dev/usb/uhci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhci.c,v 1.275.2.2 2017/11/02 21:29:52 snj Exp $ */
/* $NetBSD: uhci.c,v 1.275.2.3 2017/11/23 13:29:32 martin 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.275.2.2 2017/11/02 21:29:52 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.275.2.3 2017/11/23 13:29:32 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@ -657,7 +657,7 @@ uhci_allocx(struct usbd_bus *bus, unsigned int nframes)
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));

6
sys/dev/usb/xhci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xhci.c,v 1.72.2.3 2017/11/17 20:35:57 snj Exp $ */
/* $NetBSD: xhci.c,v 1.72.2.4 2017/11/23 13:29:32 martin Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.3 2017/11/17 20:35:57 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.4 2017/11/23 13:29:32 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@ -2182,7 +2182,7 @@ xhci_allocx(struct usbd_bus *bus, unsigned int nframes)
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

6
sys/external/bsd/dwc2/dwc2.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: dwc2.c,v 1.46 2017/06/01 02:45:12 chs Exp $ */
/* $NetBSD: dwc2.c,v 1.46.2.1 2017/11/23 13:29:32 martin 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.46.2.1 2017/11/23 13:29:32 martin Exp $");
#include "opt_usb.h"
@ -207,7 +207,7 @@ dwc2_allocx(struct usbd_bus *bus, unsigned int nframes)
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));