Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / net / ethernet / dnet.c

diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index 13d00a38a5bd60ed1e7af054f3a22b617e64317d..b69a9eacc531958b31f58cc26be60c88accbcb5a 100644 (file)
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -255,15 +255,9 @@ static int dnet_mii_probe(struct net_device *dev)
 {
        struct dnet *bp = netdev_priv(dev);
        struct phy_device *phydev = NULL;
-       int phy_addr;
 
        /* find the first phy */
-       for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
-               if (bp->mii_bus->phy_map[phy_addr]) {
-                       phydev = bp->mii_bus->phy_map[phy_addr];
-                       break;
-               }
-       }
+       phydev = phy_find_first(bp->mii_bus);
 
        if (!phydev) {
                printk(KERN_ERR "%s: no PHY found\n", dev->name);
@@ -274,11 +268,11 @@ static int dnet_mii_probe(struct net_device *dev)
 
        /* attach the mac to the phy */
        if (bp->capabilities & DNET_HAS_RMII) {
-               phydev = phy_connect(dev, dev_name(&phydev->dev),
+               phydev = phy_connect(dev, phydev_name(phydev),
                                     &dnet_handle_link_change,
                                     PHY_INTERFACE_MODE_RMII);
        } else {
-               phydev = phy_connect(dev, dev_name(&phydev->dev),
+               phydev = phy_connect(dev, phydev_name(phydev),
                                     &dnet_handle_link_change,
                                     PHY_INTERFACE_MODE_MII);
        }
@@ -308,7 +302,7 @@ static int dnet_mii_probe(struct net_device *dev)
 
 static int dnet_mii_init(struct dnet *bp)
 {
-       int err, i;
+       int err;
 
        bp->mii_bus = mdiobus_alloc();
        if (bp->mii_bus == NULL)
@@ -323,16 +317,6 @@ static int dnet_mii_init(struct dnet *bp)
 
        bp->mii_bus->priv = bp;
 
-       bp->mii_bus->irq = devm_kmalloc(&bp->pdev->dev,
-                                       sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-       if (!bp->mii_bus->irq) {
-               err = -ENOMEM;
-               goto err_out;
-       }
-
-       for (i = 0; i < PHY_MAX_ADDR; i++)
-               bp->mii_bus->irq[i] = PHY_POLL;
-
        if (mdiobus_register(bp->mii_bus)) {
                err = -ENXIO;
                goto err_out;
@@ -892,9 +876,7 @@ static int dnet_probe(struct platform_device *pdev)
               (bp->capabilities & DNET_HAS_GIGABIT) ? "" : "no ",
               (bp->capabilities & DNET_HAS_DMA) ? "" : "no ");
        phydev = bp->phy_dev;
-       dev_info(&pdev->dev, "attached PHY driver [%s] "
-              "(mii_bus:phy_addr=%s, irq=%d)\n",
-              phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+       phy_attached_info(phydev);
 
        return 0;