leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: renesas_usbhs: tidyup pio handler name

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kuninori Morimoto 2011-06-06 14:18:58 +09:00 committed by Greg Kroah-Hartman
parent 0432eed008
commit 0cb7e61d16
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/renesas_usbhs/fifo.c
View File

@ -289,7 +289,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe,
/* /*
* PIO fifo functions * 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_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@ -384,9 +384,9 @@ usbhs_fifo_write_busy:
return ret; return ret;
} }
struct usbhs_pkt_handle usbhs_fifo_push_handler = { struct usbhs_pkt_handle usbhs_fifo_pio_push_handler = {
.prepare = usbhsf_try_push, .prepare = usbhsf_pio_try_push,
.try_run = usbhsf_try_push, .try_run = usbhsf_pio_try_push,
}; };
static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done) 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; 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_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@ -485,9 +485,9 @@ usbhs_fifo_read_busy:
return ret; return ret;
} }
struct usbhs_pkt_handle usbhs_fifo_pop_handler = { struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler = {
.prepare = usbhsf_prepare_pop, .prepare = usbhsf_prepare_pop,
.try_run = usbhsf_try_pop, .try_run = usbhsf_pio_try_pop,
}; };
/* /*

4
drivers/usb/renesas_usbhs/fifo.h
View File

@ -63,8 +63,8 @@ enum {
USBHSF_PKT_TRY_RUN, USBHSF_PKT_TRY_RUN,
}; };
extern struct usbhs_pkt_handle usbhs_fifo_push_handler; extern struct usbhs_pkt_handle usbhs_fifo_pio_push_handler;
extern struct usbhs_pkt_handle usbhs_fifo_pop_handler; extern struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler;
extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler; extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
void usbhs_pkt_init(struct usbhs_pkt *pkt); void usbhs_pkt_init(struct usbhs_pkt *pkt);

8
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@ -309,10 +309,10 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
switch (stage) { switch (stage) {
case READ_DATA_STAGE: case READ_DATA_STAGE:
dcp->handler = &usbhs_fifo_push_handler; dcp->handler = &usbhs_fifo_pio_push_handler;
break; break;
case WRITE_DATA_STAGE: case WRITE_DATA_STAGE:
dcp->handler = &usbhs_fifo_pop_handler; dcp->handler = &usbhs_fifo_pio_pop_handler;
break; break;
case NODATA_STATUS_STAGE: case NODATA_STATUS_STAGE:
dcp->handler = &usbhs_ctrl_stage_end_handler; dcp->handler = &usbhs_ctrl_stage_end_handler;
@ -406,9 +406,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
pipe->mod_private = uep; pipe->mod_private = uep;
if (usb_endpoint_dir_in(desc)) if (usb_endpoint_dir_in(desc))
uep->handler = &usbhs_fifo_push_handler; uep->handler = &usbhs_fifo_pio_push_handler;
else else
uep->handler = &usbhs_fifo_pop_handler; uep->handler = &usbhs_fifo_pio_pop_handler;
ret = 0; ret = 0;
} }