[rft/rfc/patch-2.6.28-rc3+ 30/59] omap: namespace cleanup to drivers/i2c/chips/twl4030-usb.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Felipe Balbi <felipe.balbi@xxxxxxxxx>

Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
 drivers/i2c/chips/twl4030-usb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index f967353..b6c7893 100644
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -594,7 +594,7 @@ static int twl4030_set_peripheral(struct otg_transceiver *x,
 	twl = xceiv_to_twl(x);
 
 	if (!gadget) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		twl4030_phy_suspend(twl, 1);
 		twl->otg.gadget = NULL;
 
@@ -604,10 +604,10 @@ static int twl4030_set_peripheral(struct otg_transceiver *x,
 	twl->otg.gadget = gadget;
 	twl4030_phy_resume(twl);
 
-	l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
+	l = __raw_readl(OTG_CTRL) & OTG_CTRL_MASK;
 	l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
 	l |= OTG_ID;
-	omap_writel(l, OTG_CTRL);
+	__raw_writel(l, OTG_CTRL);
 
 	twl->otg.state = OTG_STATE_B_IDLE;
 
@@ -624,7 +624,7 @@ static int twl4030_set_host(struct otg_transceiver *x, struct usb_bus *host)
 	twl = xceiv_to_twl(x);
 
 	if (!host) {
-		omap_writew(0, OTG_IRQ_EN);
+		__raw_writew(0, OTG_IRQ_EN);
 		twl4030_phy_suspend(twl, 1);
 		twl->otg.host = NULL;
 
-- 
1.6.0.2.307.gc427

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux