Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc2 / hcd.h

diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index fc1054965552aca51fa7f9bcdf87bae769077437..f105bada2fd13bddb7005a3a36936bd21a4cf5a5 100644 (file)
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -371,10 +371,10 @@ static inline struct usb_hcd *dwc2_hsotg_to_hcd(struct dwc2_hsotg *hsotg)
  */
 static inline void disable_hc_int(struct dwc2_hsotg *hsotg, int chnum, u32 intr)
 {
-       u32 mask = readl(hsotg->regs + HCINTMSK(chnum));
+       u32 mask = dwc2_readl(hsotg->regs + HCINTMSK(chnum));
 
        mask &= ~intr;
-       writel(mask, hsotg->regs + HCINTMSK(chnum));
+       dwc2_writel(mask, hsotg->regs + HCINTMSK(chnum));
 }
 
 /*
@@ -382,11 +382,11 @@ static inline void disable_hc_int(struct dwc2_hsotg *hsotg, int chnum, u32 intr)
  */
 static inline int dwc2_is_host_mode(struct dwc2_hsotg *hsotg)
 {
-       return (readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) != 0;
+       return (dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) != 0;
 }
 static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg)
 {
-       return (readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) == 0;
+       return (dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) == 0;
 }
 
 /*
@@ -395,7 +395,7 @@ static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg)
  */
 static inline u32 dwc2_read_hprt0(struct dwc2_hsotg *hsotg)
 {
-       u32 hprt0 = readl(hsotg->regs + HPRT0);
+       u32 hprt0 = dwc2_readl(hsotg->regs + HPRT0);
 
        hprt0 &= ~(HPRT0_ENA | HPRT0_CONNDET | HPRT0_ENACHG | HPRT0_OVRCURRCHG);
        return hprt0;
@@ -580,7 +580,8 @@ static inline u16 dwc2_micro_frame_num(u16 frame)
  */
 static inline u32 dwc2_read_core_intr(struct dwc2_hsotg *hsotg)
 {
-       return readl(hsotg->regs + GINTSTS) & readl(hsotg->regs + GINTMSK);
+       return dwc2_readl(hsotg->regs + GINTSTS) &
+              dwc2_readl(hsotg->regs + GINTMSK);
 }
 
 static inline u32 dwc2_hcd_urb_get_status(struct dwc2_hcd_urb *dwc2_urb)
@@ -732,7 +733,7 @@ do {                                                                        \
                           qtd_list_entry);                             \
        if (usb_pipeint(_qtd_->urb->pipe) &&                            \
            (_qh_)->start_split_frame != 0 && !_qtd_->complete_split) { \
-               _hfnum_.d32 = readl((_hcd_)->regs + HFNUM);             \
+               _hfnum_.d32 = dwc2_readl((_hcd_)->regs + HFNUM);        \
                switch (_hfnum_.b.frnum & 0x7) {                        \
                case 7:                                                 \
                        (_hcd_)->hfnum_7_samples_##_letter_++;          \