diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2013-04-29 19:40:23 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 22:23:54 (GMT) |
| commit | 37e1dcc25fca3f0f48da0e28fcc1c717d5fc0f91 (patch) | |
| tree | 34b528da490934690b748d066439d7b8c72337cc /drivers/staging/dwc2 | |
| parent | 929aea09da6c61ba7c92b0bdedb6f10d0ba588bd (diff) | |
| download | linux-fsl-qoriq-37e1dcc25fca3f0f48da0e28fcc1c717d5fc0f91.tar.xz | |
staging: dwc2: use dwc2_hcd_get_frame_number where possible
Before, there were two places that manually read the FRNUM registers,
while there is a function to do this.
Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dwc2')
| -rw-r--r-- | drivers/staging/dwc2/core.c | 8 | ||||
| -rw-r--r-- | drivers/staging/dwc2/hcd_intr.c | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c index 281ca95..1a2e53a 100644 --- a/drivers/staging/dwc2/core.c +++ b/drivers/staging/dwc2/core.c @@ -1146,16 +1146,10 @@ void dwc2_hc_cleanup(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan) static void dwc2_hc_set_even_odd_frame(struct dwc2_hsotg *hsotg, struct dwc2_host_chan *chan, u32 *hcchar) { - u32 hfnum, frnum; - if (chan->ep_type == USB_ENDPOINT_XFER_INT || chan->ep_type == USB_ENDPOINT_XFER_ISOC) { - hfnum = readl(hsotg->regs + HFNUM); - frnum = hfnum >> HFNUM_FRNUM_SHIFT & - HFNUM_FRNUM_MASK >> HFNUM_FRNUM_SHIFT; - /* 1 if _next_ frame is odd, 0 if it's even */ - if (frnum & 0x1) + if (dwc2_hcd_get_frame_number(hsotg) & 0x1) *hcchar |= HCCHAR_ODDFRM; } } diff --git a/drivers/staging/dwc2/hcd_intr.c b/drivers/staging/dwc2/hcd_intr.c index 9fb9269..0eebba6 100644 --- a/drivers/staging/dwc2/hcd_intr.c +++ b/drivers/staging/dwc2/hcd_intr.c @@ -117,16 +117,13 @@ static void dwc2_sof_intr(struct dwc2_hsotg *hsotg) { struct list_head *qh_entry; struct dwc2_qh *qh; - u32 hfnum; enum dwc2_transaction_type tr_type; #ifdef DEBUG_SOF dev_vdbg(hsotg->dev, "--Start of Frame Interrupt--\n"); #endif - hfnum = readl(hsotg->regs + HFNUM); - hsotg->frame_number = hfnum >> HFNUM_FRNUM_SHIFT & - HFNUM_FRNUM_MASK >> HFNUM_FRNUM_SHIFT; + hsotg->frame_number = dwc2_hcd_get_frame_number(hsotg); dwc2_track_missed_sofs(hsotg); |