Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cb7e61d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: tidyup pio handler name 



This patch tidyup PIO packet handler name.
This is a preparation for DMAEngine support

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0432eed0

drivers/usb/renesas_usbhs/fifo.c

+7 −7
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe, 
/*

 *		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 @@ usbhs_fifo_write_busy: 
	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 @@ static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done) 
	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 @@ usbhs_fifo_read_busy: 
	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,

};



/*

drivers/usb/renesas_usbhs/fifo.h

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ enum { 
	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);

drivers/usb/renesas_usbhs/mod_gadget.c

+4 −4
Original line number Diff line number Diff line
@@ -309,10 +309,10 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv, 


	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 @@ static int usbhsg_ep_enable(struct usb_ep *ep, 
		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;

	}