commit b47fd4a025935efe04af3e88b091af1bde1ab28b
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 14 02:25:29 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 14 02:25:27 2012 -0700
tree 5b03bdebc92b08fe3d7308ab9dca19d75bf00674
parent dd67b234bbe15f618f9bf5e99429df0e0f07573c
parent 2c7bc9cd5eedd381be46a45939fbd8c1fee7a790

Merge "usb: dwc3: Bring back in readl/writel APIs"

drivers/usb/dwc3/io.h

diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index 90de7a4..a50f76b 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -50,7 +50,7 @@
 	 * space, see dwc3_probe in core.c.
 	 * However, the offsets are given starting from xHCI address space.
 	 */
-	return readl_relaxed(base + (offset - DWC3_GLOBALS_REGS_START));
+	return readl(base + (offset - DWC3_GLOBALS_REGS_START));
 }
 
 static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value)
@@ -60,7 +60,7 @@
 	 * space, see dwc3_probe in core.c.
 	 * However, the offsets are given starting from xHCI address space.
 	 */
-	writel_relaxed(value, base + (offset - DWC3_GLOBALS_REGS_START));
+	writel(value, base + (offset - DWC3_GLOBALS_REGS_START));
 }
 
 #endif /* __DRIVERS_USB_DWC3_IO_H */