Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

2 files changed, 4 insertions, 4 deletions

diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index ff162dd..b87e7a8 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -424,7 +424,7 @@ cardbus_read_device(device_t brdev, int b, int s, int f)
 
 	if (REG(PCIR_DEVVENDOR, 4) != 0xffffffff) {
 		devlist_entry = malloc(sizeof(struct cardbus_devinfo),
-		    M_DEVBUF, M_WAITOK | M_ZERO);
+		    M_DEVBUF, M_ZERO);
 		if (devlist_entry == NULL)
 			return (NULL);
 
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 7c7712a..9bee096 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -168,7 +168,7 @@ DECODE_PROTOTYPE(copy)
 	struct cis_tupleinfo *tmpbuf;
 
 	tmpbuf = malloc(sizeof(struct cis_tupleinfo) * (ncisread_buf+1),
-	    M_DEVBUF, M_WAITOK);
+	    M_DEVBUF, 0);
 	if (ncisread_buf > 0) {
 		memcpy(tmpbuf, cisread_buf,
 		    sizeof(struct cis_tupleinfo) * ncisread_buf);
@@ -178,7 +178,7 @@ DECODE_PROTOTYPE(copy)
 
 	cisread_buf[ncisread_buf].id = id;
 	cisread_buf[ncisread_buf].len = len;
-	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, M_WAITOK);
+	cisread_buf[ncisread_buf].data = malloc(len, M_DEVBUF, 0);
 	memcpy(cisread_buf[ncisread_buf].data, tupledata, len);
 	ncisread_buf++;
 	return (0);
@@ -705,7 +705,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
 	if (count == 0)
 		return (0);
 	barlist = malloc(sizeof(struct resource_list_entry*) * count, M_DEVBUF,
-	    M_WAITOK);
+	    0);
 	count = 0;
 	SLIST_FOREACH(rle, &dinfo->pci.resources, link) {
 		barlist[count] = rle;