diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-06-06 14:18:58 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 09:10:10 -0700 |
| commit | 0cb7e61d16ac68a2c5dd73a00e211287848d16e7 (patch) | |
| tree | 8b286df4f77aefd1ed73c97b61a71eb15dd3b6cf /drivers/usb | |
| parent | 0432eed008024e0e90f16207ab406ac6ec877cac (diff) | |
usb: renesas_usbhs: tidyup pio handler name
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/renesas_usbhs/fifo.c | 14 | ||||
| -rw-r--r-- | drivers/usb/renesas_usbhs/fifo.h | 4 | ||||
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod_gadget.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index 0efee5fc034b..14baaad20b79 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/drivers/usb/renesas_usbhs/fifo.c @@ -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, }; /* diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h index 4292f8c9e1f7..94db269f84c2 100644 --- a/drivers/usb/renesas_usbhs/fifo.h +++ b/drivers/usb/renesas_usbhs/fifo.h @@ -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); diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 3c582482ec44..89d2b16fbb10 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c @@ -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; } |