Skip to content

Commit

Permalink
usb: renesas_usbhs: tidyup pio handler name
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent 0432eed commit 0cb7e61
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions drivers/usb/renesas_usbhs/fifo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -384,9 +384,9 @@ static int usbhsf_try_push(struct usbhs_pkt *pkt, int *is_done)
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)
Expand All @@ -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);
Expand Down Expand Up @@ -485,9 +485,9 @@ static int usbhsf_try_pop(struct usbhs_pkt *pkt, int *is_done)
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,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/renesas_usbhs/fifo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/usb/renesas_usbhs/mod_gadget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 0cb7e61

Please sign in to comment.