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>

diff --git a/drivers/staging/dwc2/core.c b/drivers/staging/dwc2/core.c
index 281ca95dc7f4c6e28c9ecc5f850a315ecf95697c..1a2e53a8ade70835148b3b30042f46bb928a6e82 100644 (file)
--- 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 9fb926938a18cad47898c65835158e0ca536f123..0eebba668399d6d832c15e10c70e4c9b7132e2be 100644 (file)
--- 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);