net: ethernet: ti: davinci_mdio: switch to readl/writel()

[sfrench/cifs-2.6.git] / drivers / net / ethernet / ti / davinci_mdio.c

diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index a98aedae1b41d7baa424d6b5a51622ec3af5bee0..c2740dbe91541673e5d0a278c05cd5f8c1491abf 100644 (file)
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -140,7 +140,7 @@ static void davinci_mdio_init_clk(struct davinci_mdio_data *data)
 static void davinci_mdio_enable(struct davinci_mdio_data *data)
 {
        /* set enable and clock divider */
-       __raw_writel(data->clk_div | CONTROL_ENABLE, &data->regs->control);
+       writel(data->clk_div | CONTROL_ENABLE, &data->regs->control);
 }
 
 static int davinci_mdio_reset(struct mii_bus *bus)
@@ -159,7 +159,7 @@ static int davinci_mdio_reset(struct mii_bus *bus)
        msleep(PHY_MAX_ADDR * data->access_time);
 
        /* dump hardware version info */
-       ver = __raw_readl(&data->regs->version);
+       ver = readl(&data->regs->version);
        dev_info(data->dev,
                 "davinci mdio revision %d.%d, bus freq %ld\n",
                 (ver >> 8) & 0xff, ver & 0xff,
@@ -169,7 +169,7 @@ static int davinci_mdio_reset(struct mii_bus *bus)
                goto done;
 
        /* get phy mask from the alive register */
-       phy_mask = __raw_readl(&data->regs->alive);
+       phy_mask = readl(&data->regs->alive);
        if (phy_mask) {
                /* restrict mdio bus to live phys only */
                dev_info(data->dev, "detected phy mask %x\n", ~phy_mask);
@@ -196,11 +196,11 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)
        u32 reg;
 
        while (time_after(timeout, jiffies)) {
-               reg = __raw_readl(&regs->user[0].access);
+               reg = readl(&regs->user[0].access);
                if ((reg & USERACCESS_GO) == 0)
                        return 0;
 
-               reg = __raw_readl(&regs->control);
+               reg = readl(&regs->control);
                if ((reg & CONTROL_IDLE) == 0) {
                        usleep_range(100, 200);
                        continue;
@@ -216,7 +216,7 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)
                return -EAGAIN;
        }
 
-       reg = __raw_readl(&regs->user[0].access);
+       reg = readl(&regs->user[0].access);
        if ((reg & USERACCESS_GO) == 0)
                return 0;
 
@@ -263,7 +263,7 @@ static int davinci_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg)
                if (ret < 0)
                        break;
 
-               __raw_writel(reg, &data->regs->user[0].access);
+               writel(reg, &data->regs->user[0].access);
 
                ret = wait_for_user_access(data);
                if (ret == -EAGAIN)
@@ -271,7 +271,7 @@ static int davinci_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg)
                if (ret < 0)
                        break;
 
-               reg = __raw_readl(&data->regs->user[0].access);
+               reg = readl(&data->regs->user[0].access);
                ret = (reg & USERACCESS_ACK) ? (reg & USERACCESS_DATA) : -EIO;
                break;
        }
@@ -307,7 +307,7 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id,
                if (ret < 0)
                        break;
 
-               __raw_writel(reg, &data->regs->user[0].access);
+               writel(reg, &data->regs->user[0].access);
 
                ret = wait_for_user_access(data);
                if (ret == -EAGAIN)
@@ -472,9 +472,9 @@ static int davinci_mdio_runtime_suspend(struct device *dev)
        u32 ctrl;
 
        /* shutdown the scan state machine */
-       ctrl = __raw_readl(&data->regs->control);
+       ctrl = readl(&data->regs->control);
        ctrl &= ~CONTROL_ENABLE;
-       __raw_writel(ctrl, &data->regs->control);
+       writel(ctrl, &data->regs->control);
        wait_for_idle(data);
 
        return 0;