From: Felipe Balbi <felipe.balbi@xxxxxxxxx>
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
drivers/net/irda/omap-ir.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index b706253..3652ff3 100644
--- a/drivers/net/irda/omap-ir.c
+++ b/drivers/net/irda/omap-ir.c
@@ -138,12 +138,12 @@ struct omap_irda {
static void inline uart_reg_out(int idx, u8 val)
{
- omap_writeb(val, idx);
+ __raw_writeb(val, idx);
}
static u8 inline uart_reg_in(int idx)
{
- u8 b = omap_readb(idx);
+ u8 b = __raw_readb(idx);
return b;
}
@@ -232,14 +232,14 @@ static int omap_irda_startup(struct net_device *dev)
/* FIXME: use clk_* apis for UART3 clock*/
/* Enable UART3 clock and set UART3 to IrDA mode */
if (machine_is_omap_h2() || machine_is_omap_h3())
- omap_writel(omap_readl(MOD_CONF_CTRL_0) | (1 << 31) | (1 << 15),
+ __raw_writel(__raw_readl(MOD_CONF_CTRL_0) | (1 << 31) | (1 << 15),
MOD_CONF_CTRL_0);
/* Only for H2?
*/
if (omap_ir->pdata->transceiver_mode && machine_is_omap_h2()) {
/* Is it select_irda on H2 ? */
- omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7,
+ __raw_writel(__raw_readl(FUNC_MUX_CTRL_A) | 7,
FUNC_MUX_CTRL_A);
omap_ir->pdata->transceiver_mode(omap_ir->dev, IR_SIRMODE);
}
--
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
