Skip to content

Commit 0cb7e61

Browse files
morimotogregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0432eed commit 0cb7e61

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

drivers/usb/renesas_usbhs/fifo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe,
289289
/*
290290
* PIO fifo functions
291291
*/
292-
static int usbhsf_try_push(struct usbhs_pkt *pkt, int *is_done)
292+
static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
293293
{
294294
struct usbhs_pipe *pipe = pkt->pipe;
295295
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -384,9 +384,9 @@ static int usbhsf_try_push(struct usbhs_pkt *pkt, int *is_done)
384384
return ret;
385385
}
386386

387-
struct usbhs_pkt_handle usbhs_fifo_push_handler = {
388-
.prepare = usbhsf_try_push,
389-
.try_run = usbhsf_try_push,
387+
struct usbhs_pkt_handle usbhs_fifo_pio_push_handler = {
388+
.prepare = usbhsf_pio_try_push,
389+
.try_run = usbhsf_pio_try_push,
390390
};
391391

392392
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)
406406
return 0;
407407
}
408408

409-
static int usbhsf_try_pop(struct usbhs_pkt *pkt, int *is_done)
409+
static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
410410
{
411411
struct usbhs_pipe *pipe = pkt->pipe;
412412
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -485,9 +485,9 @@ static int usbhsf_try_pop(struct usbhs_pkt *pkt, int *is_done)
485485
return ret;
486486
}
487487

488-
struct usbhs_pkt_handle usbhs_fifo_pop_handler = {
488+
struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler = {
489489
.prepare = usbhsf_prepare_pop,
490-
.try_run = usbhsf_try_pop,
490+
.try_run = usbhsf_pio_try_pop,
491491
};
492492

493493
/*

drivers/usb/renesas_usbhs/fifo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ enum {
6363
USBHSF_PKT_TRY_RUN,
6464
};
6565

66-
extern struct usbhs_pkt_handle usbhs_fifo_push_handler;
67-
extern struct usbhs_pkt_handle usbhs_fifo_pop_handler;
66+
extern struct usbhs_pkt_handle usbhs_fifo_pio_push_handler;
67+
extern struct usbhs_pkt_handle usbhs_fifo_pio_pop_handler;
6868
extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
6969

7070
void usbhs_pkt_init(struct usbhs_pkt *pkt);

drivers/usb/renesas_usbhs/mod_gadget.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
309309

310310
switch (stage) {
311311
case READ_DATA_STAGE:
312-
dcp->handler = &usbhs_fifo_push_handler;
312+
dcp->handler = &usbhs_fifo_pio_push_handler;
313313
break;
314314
case WRITE_DATA_STAGE:
315-
dcp->handler = &usbhs_fifo_pop_handler;
315+
dcp->handler = &usbhs_fifo_pio_pop_handler;
316316
break;
317317
case NODATA_STATUS_STAGE:
318318
dcp->handler = &usbhs_ctrl_stage_end_handler;
@@ -406,9 +406,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
406406
pipe->mod_private = uep;
407407

408408
if (usb_endpoint_dir_in(desc))
409-
uep->handler = &usbhs_fifo_push_handler;
409+
uep->handler = &usbhs_fifo_pio_push_handler;
410410
else
411-
uep->handler = &usbhs_fifo_pop_handler;
411+
uep->handler = &usbhs_fifo_pio_pop_handler;
412412

413413
ret = 0;
414414
}

0 commit comments

Comments
 (0)