From: Matthijs Kooijman Date: Mon, 29 Apr 2013 19:40:23 +0000 (+0000) Subject: staging: dwc2: use dwc2_hcd_get_frame_number where possible X-Git-Tag: firefly_0821_release~176^2~5845^2~737 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37e1dcc25fca3f0f48da0e28fcc1c717d5fc0f91;p=firefly-linux-kernel-4.4.55.git 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 Acked-by: Paul Zimmerman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c index 281ca95dc7f4..1a2e53a8ade7 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 9fb926938a18..0eebba668399 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);