aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-06-06 01:18:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-07 12:10:10 -0400
commit0cb7e61d16ac68a2c5dd73a00e211287848d16e7 (patch)
tree8b286df4f77aefd1ed73c97b61a71eb15dd3b6cf
parent0432eed008024e0e90f16207ab406ac6ec877cac (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>
-rw-r--r--drivers/usb/renesas_usbhs/fifo.c14
-rw-r--r--drivers/usb/renesas_usbhs/fifo.h4
-rw-r--r--drivers/usb/renesas_usbhs/mod_gadget.c8
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,
289/* 289/*
290 * PIO fifo functions 290 * PIO fifo functions
291 */ 291 */
292static int usbhsf_try_push(struct usbhs_pkt *pkt, int *is_done) 292static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
293{ 293{
294 struct usbhs_pipe *pipe = pkt->pipe; 294 struct usbhs_pipe *pipe = pkt->pipe;
295 struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); 295 struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -384,9 +384,9 @@ usbhs_fifo_write_busy:
384 return ret; 384 return ret;
385} 385}
386 386
387struct usbhs_pkt_handle usbhs_fifo_push_handler = { 387struct usbhs_pkt_handle usbhs_fifo_pio_push_handler = {
388 .prepare = usbhsf_try_push, 388 .prepare = usbhsf_pio_try_push,
389 .try_run = usbhsf_try_push, 389 .try_run = usbhsf_pio_try_push,
390}; 390};
391 391
392static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done) 392static 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)
406 return 0; 406 return 0;
407} 407}
408 408
409static int usbhsf_try_pop(struct usbhs_pkt *pkt, int *is_done) 409static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
410{ 410{
411 struct usbhs_pipe *pipe = pkt->pipe; 411 struct usbhs_pipe *pipe = pkt->pipe;
412 struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); 412 struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -485,9 +485,9 @@ usbhs_fifo_read_busy:
485 return ret; 485 return ret;
486} 486}
487 487
488struct usbhs_pkt_handle usbhs_fifo_pop_handler = { 488struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler = {
489 .prepare = usbhsf_prepare_pop, 489 .prepare = usbhsf_prepare_pop,
490 .try_run = usbhsf_try_pop, 490 .try_run = usbhsf_pio_try_pop,
491}; 491};
492 492
493/* 493/*
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 {
63 USBHSF_PKT_TRY_RUN, 63 USBHSF_PKT_TRY_RUN,
64}; 64};
65 65
66extern struct usbhs_pkt_handle usbhs_fifo_push_handler; 66extern struct usbhs_pkt_handle usbhs_fifo_pio_push_handler;
67extern struct usbhs_pkt_handle usbhs_fifo_pop_handler; 67extern struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler;
68extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler; 68extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
69 69
70void usbhs_pkt_init(struct usbhs_pkt *pkt); 70void 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,
309 309
310 switch (stage) { 310 switch (stage) {
311 case READ_DATA_STAGE: 311 case READ_DATA_STAGE:
312 dcp->handler = &usbhs_fifo_push_handler; 312 dcp->handler = &usbhs_fifo_pio_push_handler;
313 break; 313 break;
314 case WRITE_DATA_STAGE: 314 case WRITE_DATA_STAGE:
315 dcp->handler = &usbhs_fifo_pop_handler; 315 dcp->handler = &usbhs_fifo_pio_pop_handler;
316 break; 316 break;
317 case NODATA_STATUS_STAGE: 317 case NODATA_STATUS_STAGE:
318 dcp->handler = &usbhs_ctrl_stage_end_handler; 318 dcp->handler = &usbhs_ctrl_stage_end_handler;
@@ -406,9 +406,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
406 pipe->mod_private = uep; 406 pipe->mod_private = uep;
407 407
408 if (usb_endpoint_dir_in(desc)) 408 if (usb_endpoint_dir_in(desc))
409 uep->handler = &usbhs_fifo_push_handler; 409 uep->handler = &usbhs_fifo_pio_push_handler;
410 else 410 else
411 uep->handler = &usbhs_fifo_pop_handler; 411 uep->handler = &usbhs_fifo_pio_pop_handler;
412 412
413 ret = 0; 413 ret = 0;
414 } 414 }