diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 0efee5f..14baaad 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -289,7 +289,7 @@
 /*
  *		PIO fifo functions
  */
-static int usbhsf_try_push(struct usbhs_pkt *pkt, int *is_done)
+static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
 {
 	struct usbhs_pipe *pipe = pkt->pipe;
 	struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -384,9 +384,9 @@
 	return ret;
 }
 
-struct usbhs_pkt_handle usbhs_fifo_push_handler = {
-	.prepare = usbhsf_try_push,
-	.try_run = usbhsf_try_push,
+struct usbhs_pkt_handle usbhs_fifo_pio_push_handler = {
+	.prepare = usbhsf_pio_try_push,
+	.try_run = usbhsf_pio_try_push,
 };
 
 static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
@@ -406,7 +406,7 @@
 	return 0;
 }
 
-static int usbhsf_try_pop(struct usbhs_pkt *pkt, int *is_done)
+static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
 {
 	struct usbhs_pipe *pipe = pkt->pipe;
 	struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -485,9 +485,9 @@
 	return ret;
 }
 
-struct usbhs_pkt_handle usbhs_fifo_pop_handler = {
+struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler = {
 	.prepare = usbhsf_prepare_pop,
-	.try_run = usbhsf_try_pop,
+	.try_run = usbhsf_pio_try_pop,
 };
 
 /*
diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h
index 4292f8c..94db269 100644
--- a/drivers/usb/renesas_usbhs/fifo.h
+++ b/drivers/usb/renesas_usbhs/fifo.h
@@ -63,8 +63,8 @@
 	USBHSF_PKT_TRY_RUN,
 };
 
-extern struct usbhs_pkt_handle usbhs_fifo_push_handler;
-extern struct usbhs_pkt_handle usbhs_fifo_pop_handler;
+extern struct usbhs_pkt_handle usbhs_fifo_pio_push_handler;
+extern struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler;
 extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
 
 void usbhs_pkt_init(struct usbhs_pkt *pkt);
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 3c58248..89d2b16 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -309,10 +309,10 @@
 
 	switch (stage) {
 	case READ_DATA_STAGE:
-		dcp->handler = &usbhs_fifo_push_handler;
+		dcp->handler = &usbhs_fifo_pio_push_handler;
 		break;
 	case WRITE_DATA_STAGE:
-		dcp->handler = &usbhs_fifo_pop_handler;
+		dcp->handler = &usbhs_fifo_pio_pop_handler;
 		break;
 	case NODATA_STATUS_STAGE:
 		dcp->handler = &usbhs_ctrl_stage_end_handler;
@@ -406,9 +406,9 @@
 		pipe->mod_private	= uep;
 
 		if (usb_endpoint_dir_in(desc))
-			uep->handler = &usbhs_fifo_push_handler;
+			uep->handler = &usbhs_fifo_pio_push_handler;
 		else
-			uep->handler = &usbhs_fifo_pop_handler;
+			uep->handler = &usbhs_fifo_pio_pop_handler;
 
 		ret = 0;
 	}