ramips: merge ops-rt288x.c and rt288x_pci.h into pci-rt288x.c

[openwrt.git] / target / linux / ifxmips / files / drivers / net / ifxmips_mii0.c

diff --git a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
index 695e0b7..0fddc63 100644 (file)
--- a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
+++ b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c
@@ -55,7 +55,8 @@ void ifxmips_write_mdio(u32 phy_addr, u32 phy_reg, u16 phy_data)
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET) |
                phy_data;
 
-       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST);
+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;
        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);
 }
 EXPORT_SYMBOL(ifxmips_write_mdio);
@@ -66,9 +67,11 @@ unsigned short ifxmips_read_mdio(u32 phy_addr, u32 phy_reg)
                ((phy_addr & MDIO_ACC_ADDR_MASK) << MDIO_ACC_ADDR_OFFSET) |
                ((phy_reg & MDIO_ACC_REG_MASK) << MDIO_ACC_REG_OFFSET);
 
-       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST) ;
+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;
        ifxmips_w32(val, IFXMIPS_PPE32_MDIO_ACC);
-       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST) ;
+       while (ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_REQUEST)
+               ;
        val = ifxmips_r32(IFXMIPS_PPE32_MDIO_ACC) & MDIO_ACC_VAL_MASK;
        return val;
 }
@@ -76,7 +79,7 @@ EXPORT_SYMBOL(ifxmips_read_mdio);
 
 int ifxmips_ifxmips_mii_open(struct net_device *dev)
 {
-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(dev);
        struct dma_device_info *dma_dev = priv->dma_device;
        int i;
 
@@ -90,7 +93,7 @@ int ifxmips_ifxmips_mii_open(struct net_device *dev)
 
 int ifxmips_mii_release(struct net_device *dev)
 {
-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(dev);
        struct dma_device_info *dma_dev = priv->dma_device;
        int i;
 
@@ -102,7 +105,7 @@ int ifxmips_mii_release(struct net_device *dev)
 
 int ifxmips_mii_hw_receive(struct net_device *dev, struct dma_device_info *dma_dev)
 {
-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(dev);
        unsigned char *buf = NULL;
        struct sk_buff *skb = NULL;
        int len = 0;
@@ -151,7 +154,7 @@ ifxmips_mii_hw_receive_err_exit:
 int ifxmips_mii_hw_tx(char *buf, int len, struct net_device *dev)
 {
        int ret = 0;
-       struct ifxmips_mii_priv *priv = dev->priv;
+       struct ifxmips_mii_priv *priv = netdev_priv(dev);
        struct dma_device_info *dma_dev = priv->dma_device;
        ret = dma_device_write(dma_dev, buf, len, priv->skb);
        return ret;
@@ -161,7 +164,7 @@ int ifxmips_mii_tx(struct sk_buff *skb, struct net_device *dev)
 {
        int len;
        char *data;
-       struct ifxmips_mii_priv *priv = dev->priv;
+       struct ifxmips_mii_priv *priv = netdev_priv(dev);
        struct dma_device_info *dma_dev = priv->dma_device;
 
        len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
@@ -189,7 +192,7 @@ int ifxmips_mii_tx(struct sk_buff *skb, struct net_device *dev)
 void ifxmips_mii_tx_timeout(struct net_device *dev)
 {
        int i;
-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(dev);
 
        priv->stats.tx_errors++;
        for (i = 0; i < priv->dma_device->max_tx_chan_num; i++)
@@ -258,14 +261,13 @@ void ifxmips_etop_dma_buffer_free(unsigned char *dataptr, void *opt)
 
 static struct net_device_stats *ifxmips_get_stats(struct net_device *dev)
 {
-       return (struct net_device_stats *)dev->priv;
+       return &((struct ifxmips_mii_priv *)netdev_priv(dev))->stats;
 }
 
 static int ifxmips_mii_dev_init(struct net_device *dev)
 {
        int i;
-       struct ifxmips_mii_priv *priv;
-
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(dev);
        ether_setup(dev);
        printk(KERN_INFO "ifxmips_mii0: %s is up\n", dev->name);
        dev->open = ifxmips_ifxmips_mii_open;
@@ -274,8 +276,7 @@ static int ifxmips_mii_dev_init(struct net_device *dev)
        dev->get_stats = ifxmips_get_stats;
        dev->tx_timeout = ifxmips_mii_tx_timeout;
        dev->watchdog_timeo = 10 * HZ;
-       memset(dev->priv, 0, sizeof(struct ifxmips_mii_priv));
-       priv = dev->priv;
+       memset(priv, 0, sizeof(struct ifxmips_mii_priv));
        priv->dma_device = dma_device_reserve("PPE");
        if (!priv->dma_device) {
                BUG();
@@ -302,7 +303,7 @@ static int ifxmips_mii_dev_init(struct net_device *dev)
        printk(KERN_INFO "ifxmips_mii0: using mac=");
        for (i = 0; i < 6; i++) {
                dev->dev_addr[i] = mac_addr[i];
-               printk("%02X%c", dev->dev_addr[i], (i == 5)?('\n'):(':'));
+               printk("%02X%c", dev->dev_addr[i], (i == 5) ? ('\n') : (':'));
        }
        return 0;
 }
@@ -344,14 +345,13 @@ out:
 
 static int ifxmips_mii_remove(struct platform_device *dev)
 {
-       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)ifxmips_mii0_dev->priv;
+       struct ifxmips_mii_priv *priv = (struct ifxmips_mii_priv *)netdev_priv(ifxmips_mii0_dev);
 
        printk(KERN_INFO "ifxmips_mii0: ifxmips_mii0 cleanup\n");
 
        dma_device_unregister(priv->dma_device);
        dma_device_release(priv->dma_device);
        kfree(priv->dma_device);
-       kfree(ifxmips_mii0_dev->priv);
        unregister_netdev(ifxmips_mii0_dev);
        return 0;
 }