[rft/rfc/patch-2.6.28-rc3+ 44/59] omap: namespace cleanup to drivers/usb/musb/omap2430.c

[Felipe Balbi]

From: Felipe Balbi <[EMAIL PROTECTED]>

Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
---
 drivers/usb/musb/omap2430.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index be4e779..4e18035 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -225,7 +225,7 @@ int __init musb_platform_init(struct musb *musb)
        musb->xceiv = *x;
        musb_platform_resume(musb);
 
-       l = omap_readl(OTG_SYSCONFIG);
+       l = __raw_readl(OTG_SYSCONFIG);
        l &= ~ENABLEWAKEUP;     /* disable wakeup */
        l &= ~NOSTDBY;          /* remove possible nostdby */
        l |= SMARTSTDBY;        /* enable smart standby */
@@ -233,17 +233,17 @@ int __init musb_platform_init(struct musb *musb)
        l &= ~NOIDLE;           /* remove possible noidle */
        l |= SMARTIDLE;         /* enable smart idle */
        l |= AUTOIDLE;          /* enable auto idle */
-       omap_writel(l, OTG_SYSCONFIG);
+       __raw_writel(l, OTG_SYSCONFIG);
 
-       l = omap_readl(OTG_INTERFSEL);
+       l = __raw_readl(OTG_INTERFSEL);
        l |= ULPI_12PIN;
-       omap_writel(l, OTG_INTERFSEL);
+       __raw_writel(l, OTG_INTERFSEL);
 
        pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, "
                        "sysstatus 0x%x, intrfsel 0x%x, simenable  0x%x\n",
-                       omap_readl(OTG_REVISION), omap_readl(OTG_SYSCONFIG),
-                       omap_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL),
-                       omap_readl(OTG_SIMENABLE));
+                       __raw_readl(OTG_REVISION), omap_readl(OTG_SYSCONFIG),
+                       __raw_readl(OTG_SYSSTATUS), omap_readl(OTG_INTERFSEL),
+                       __raw_readl(OTG_SIMENABLE));
 
        omap_vbus_power(musb, musb->board_mode == MUSB_HOST, 1);
 
@@ -266,13 +266,13 @@ int musb_platform_suspend(struct musb *musb)
                return 0;
 
        /* in any role */
-       l = omap_readl(OTG_FORCESTDBY);
+       l = __raw_readl(OTG_FORCESTDBY);
        l |= ENABLEFORCE;       /* enable MSTANDBY */
-       omap_writel(l, OTG_FORCESTDBY);
+       __raw_writel(l, OTG_FORCESTDBY);
 
-       l = omap_readl(OTG_SYSCONFIG);
+       l = __raw_readl(OTG_SYSCONFIG);
        l |= ENABLEWAKEUP;      /* enable wakeup */
-       omap_writel(l, OTG_SYSCONFIG);
+       __raw_writel(l, OTG_SYSCONFIG);
 
        if (musb->xceiv.set_suspend)
                musb->xceiv.set_suspend(&musb->xceiv, 1);
@@ -300,13 +300,13 @@ static int musb_platform_resume(struct musb *musb)
        else
                clk_enable(musb->clock);
 
-       l = omap_readl(OTG_SYSCONFIG);
+       l = __raw_readl(OTG_SYSCONFIG);
        l &= ~ENABLEWAKEUP;     /* disable wakeup */
-       omap_writel(l, OTG_SYSCONFIG);
+       __raw_writel(l, OTG_SYSCONFIG);
 
-       l = omap_readl(OTG_FORCESTDBY);
+       l = __raw_readl(OTG_FORCESTDBY);
        l &= ~ENABLEFORCE;      /* disable MSTANDBY */
-       omap_writel(l, OTG_FORCESTDBY);
+       __raw_writel(l, OTG_FORCESTDBY);
 
        return 0;
 }
-- 
1.6.0.2.307.gc427

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