Convert malloc(9)/free(9) usages.

4 files changed, 29 insertions, 25 deletions

diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 76520c769fe..f69253f17b3 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.c,v 1.10 2015/02/10 14:18:34 uebayasi Exp $	*/
+/*	$OpenBSD: dwc2.c,v 1.11 2015/02/10 14:34:14 uebayasi Exp $	*/
 /*	$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $	*/
 
 /*-
@@ -1603,7 +1603,8 @@ dwc2_init(struct dwc2_softc *sc)
 	    "dwc2qtd", NULL);
 	pool_setipl(&sc->sc_qtdpool, IPL_USB);
 
-	sc->sc_hsotg = malloc(sizeof(struct dwc2_hsotg), KM_SLEEP);
+	sc->sc_hsotg = malloc(sizeof(struct dwc2_hsotg), M_DEVBUF,
+	    M_ZERO | M_WAITOK);
 	if (sc->sc_hsotg == NULL) {
 		err = ENOMEM;
 		goto fail1;
@@ -1622,7 +1623,7 @@ dwc2_init(struct dwc2_softc *sc)
 	return 0;
 
 fail2:
-	free(sc->sc_hsotg, sizeof(struct dwc2_hsotg));
+	free(sc->sc_hsotg, M_DEVBUF, sizeof(struct dwc2_hsotg));
 fail1:
 	softintr_disestablish(sc->sc_rhc_si);
 
diff --git a/sys/dev/usb/dwc2/dwc2.h b/sys/dev/usb/dwc2/dwc2.h
index 5ccb496763e..6543b9a59f6 100644
--- a/sys/dev/usb/dwc2/dwc2.h
+++ b/sys/dev/usb/dwc2/dwc2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.h,v 1.5 2015/02/10 14:15:14 uebayasi Exp $	*/
+/*	$OpenBSD: dwc2.h,v 1.6 2015/02/10 14:34:14 uebayasi Exp $	*/
 /*	$NetBSD: dwc2.h,v 1.4 2014/12/23 16:20:06 macallan Exp $	*/
 
 /*-
@@ -106,7 +106,7 @@ extern int dwc2debug;
 #define msecs_to_jiffies	mstohz
 
 #define gfp_t		int
-#define GFP_KERNEL	 KM_SLEEP
+#define GFP_KERNEL	 M_WAITOK
 #define GFP_ATOMIC	 KM_NOSLEEP
 
 enum usb_otg_state {
diff --git a/sys/dev/usb/dwc2/dwc2_hcd.c b/sys/dev/usb/dwc2/dwc2_hcd.c
index f7eb5963cc4..af250a546c3 100644
--- a/sys/dev/usb/dwc2/dwc2_hcd.c
+++ b/sys/dev/usb/dwc2/dwc2_hcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcd.c,v 1.6 2015/02/10 14:18:34 uebayasi Exp $	*/
+/*	$OpenBSD: dwc2_hcd.c,v 1.7 2015/02/10 14:34:14 uebayasi Exp $	*/
 /*	$NetBSD: dwc2_hcd.c,v 1.15 2014/11/24 10:14:14 skrll Exp $	*/
 
 /*
@@ -1779,7 +1779,7 @@ dwc2_hcd_urb_alloc(struct dwc2_hsotg *hsotg, int iso_desc_count,
 	u32 size = sizeof(*urb) + iso_desc_count *
 		   sizeof(struct dwc2_hcd_iso_packet_desc);
 
-	urb = malloc(size, mem_flags);
+	urb = malloc(size, M_DEVBUF, M_ZERO | mem_flags);
 	if (urb)
 		urb->packet_count = iso_desc_count;
 	return urb;
@@ -1793,7 +1793,7 @@ dwc2_hcd_urb_free(struct dwc2_hsotg *hsotg, struct dwc2_hcd_urb *urb,
 	u32 size = sizeof(*urb) + iso_desc_count *
 		   sizeof(struct dwc2_hcd_iso_packet_desc);
 
-	free(urb, size);
+	free(urb, M_DEVBUF, size);
 }
 
 void
@@ -2103,7 +2103,7 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg)
 			dev_dbg(hsotg->dev, "HCD Free channel #%i, chan=%p\n",
 				i, chan);
 			hsotg->hc_ptr_array[i] = NULL;
-			free(chan, sizeof(*chan));
+			free(chan, M_DEVBUF, sizeof(*chan));
 		}
 	}
 
@@ -2114,7 +2114,7 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg)
 			hsotg->status_buf = NULL;
 		}
 	} else {
-		free(hsotg->status_buf,DWC2_HCD_STATUS_BUF_SIZE);
+		free(hsotg->status_buf, M_DEVBUF, DWC2_HCD_STATUS_BUF_SIZE);
 		hsotg->status_buf = NULL;
 	}
 
@@ -2135,7 +2135,7 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg)
 		taskq_destroy(hsotg->wq_otg);
 	}
 
-	free(hsotg->core_params, sizeof(*hsotg->core_params));
+	free(hsotg->core_params, M_DEVBUF, sizeof(*hsotg->core_params));
 	hsotg->core_params = NULL;
 	timeout_destroy(&hsotg->wkp_timer);
 }
@@ -2190,18 +2190,20 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg,
 
 #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS
 	hsotg->frame_num_array = malloc(sizeof(*hsotg->frame_num_array) *
-					 FRAME_NUM_ARRAY_SIZE, KM_SLEEP);
+					FRAME_NUM_ARRAY_SIZE, M_DEVBUF,
+					M_ZERO | M_WAITOK);
 	if (!hsotg->frame_num_array)
 		goto error1;
 	hsotg->last_frame_num_array = malloc(
 			sizeof(*hsotg->last_frame_num_array) *
-			FRAME_NUM_ARRAY_SIZE, KM_SLEEP);
+			FRAME_NUM_ARRAY_SIZE, M_DEVBUF, M_ZERO | M_WAITOK);
 	if (!hsotg->last_frame_num_array)
 		goto error1;
 	hsotg->last_frame_num = HFNUM_MAX_FRNUM;
 #endif
 
-	hsotg->core_params = malloc(sizeof(*hsotg->core_params), KM_SLEEP);
+	hsotg->core_params = malloc(sizeof(*hsotg->core_params), M_DEVBUF,
+				    M_ZERO | M_WAITOK);
 	if (!hsotg->core_params)
 		goto error1;
 
@@ -2256,7 +2258,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg,
 	memset(&hsotg->hc_ptr_array[0], 0, sizeof(hsotg->hc_ptr_array));
 
 	for (i = 0; i < num_channels; i++) {
-		channel = malloc(sizeof(*channel), KM_SLEEP);
+		channel = malloc(sizeof(*channel), M_DEVBUF, M_ZERO | M_WAITOK);
 		if (channel == NULL)
 			goto error3;
 		channel->hc_num = i;
@@ -2288,8 +2290,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg,
 			hsotg->status_buf_dma = DMAADDR(&hsotg->status_buf_usbdma, 0);
 		}
 	} else
-		hsotg->status_buf = malloc(DWC2_HCD_STATUS_BUF_SIZE,
-					  KM_SLEEP);
+		hsotg->status_buf = malloc(DWC2_HCD_STATUS_BUF_SIZE, M_DEVBUF,
+					   M_ZERO | M_WAITOK);
 
 	if (!hsotg->status_buf)
 		goto error3;
@@ -2314,13 +2316,13 @@ error3:
 	dwc2_hcd_release(hsotg);
 error2:
 error1:
-	free(hsotg->core_params, sizeof(*hsotg->core_params));
+	free(hsotg->core_params, M_DEVBUF, sizeof(*hsotg->core_params));
 
 #ifdef CONFIG_USB_DWC2_TRACK_MISSED_SOFS
-	free(hsotg->last_frame_num_array,
-	      sizeof(*hsotg->last_frame_num_array) * FRAME_NUM_ARRAY_SIZE);
-	free(hsotg->frame_num_array,
-		  sizeof(*hsotg->frame_num_array) * FRAME_NUM_ARRAY_SIZE);
+	free(hsotg->last_frame_num_array, M_DEVBUF,
+		sizeof(*hsotg->last_frame_num_array) * FRAME_NUM_ARRAY_SIZE);
+	free(hsotg->frame_num_array, M_DEVBUF,
+		sizeof(*hsotg->frame_num_array) * FRAME_NUM_ARRAY_SIZE);
 #endif
 
 	dev_err(hsotg->dev, "%s() FAILED, returning %d\n", __func__, retval);
diff --git a/sys/dev/usb/dwc2/dwc2_hcdddma.c b/sys/dev/usb/dwc2/dwc2_hcdddma.c
index ccf8387f3e0..52fe8cb6589 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdddma.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdddma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2_hcdddma.c,v 1.5 2015/02/10 13:49:48 uebayasi Exp $	*/
+/*	$OpenBSD: dwc2_hcdddma.c,v 1.6 2015/02/10 14:34:14 uebayasi Exp $	*/
 /*	$NetBSD: dwc2_hcdddma.c,v 1.6 2014/04/03 06:34:58 skrll Exp $	*/
 
 /*
@@ -124,7 +124,8 @@ static int dwc2_desc_list_alloc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh,
 	memset(qh->desc_list, 0,
 	       sizeof(struct dwc2_hcd_dma_desc) * dwc2_max_desc_num(qh));
 
-	qh->n_bytes = malloc(sizeof(u32) * dwc2_max_desc_num(qh), KM_SLEEP);
+	qh->n_bytes = malloc(sizeof(u32) * dwc2_max_desc_num(qh), M_DEVBUF,
+	    M_ZERO | M_WAITOK);
 	if (!qh->n_bytes) {
 		usb_freemem(&hsotg->hsotg_sc->sc_bus, &qh->desc_list_usbdma);
 		qh->desc_list = NULL;
@@ -141,7 +142,7 @@ static void dwc2_desc_list_free(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 		qh->desc_list = NULL;
 	}
 
-	free(qh->n_bytes, sizeof(u32) * dwc2_max_desc_num(qh));
+	free(qh->n_bytes, M_DEVBUF, sizeof(u32) * dwc2_max_desc_num(qh));
 	qh->n_bytes = NULL;
 }