Revert "ar71xx: ag71xx: Add connect message: fixed phy"

[openwrt/staging/wigyori.git] / target / linux / ar71xx / files / drivers / net / ethernet / atheros / ag71xx / ag71xx_phy.c

diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
index 1683fce882f6d9a172f0efe0e87a9f886e7a024f..daa373be693291ca5302470cfde4129a59d9e72f 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_phy.c
@@ -76,10 +76,24 @@ void ag71xx_phy_stop(struct ag71xx *ag)
 
 static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
 {
-       struct device *dev = &ag->pdev->dev;
+       struct platform_device *pdev = ag->pdev;
+       struct device *dev = NULL;
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        int ret = 0;
 
+       if (!pdev)
+               return -ENODEV;
+
+       dev = &pdev->dev;
+
+       if (!dev)
+               return -ENODEV;
+
+       if (!ag->phy_dev) {
+               pr_err("Missing PHY for %s", dev_name(dev));
+               return -ENODEV;
+       }
+
        /* use fixed settings */
        switch (pdata->speed) {
        case SPEED_10:
@@ -97,13 +111,6 @@ static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
        ag->duplex = pdata->duplex;
        ag->speed = pdata->speed;
 
-       if (!ret) {
-               dev_info(dev, "connected to fixed PHY at %s [uid=%08x, driver=%s]\n",
-                           phydev_name(ag->phy_dev),
-                           ag->phy_dev->phy_id, ag->phy_dev->drv->name);
-       } else {
-               pr_err("Failed to connect to fixed PHY\n");
-       }
        return ret;
 }
 
@@ -126,8 +133,7 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
                DBG("%s: PHY found at %s, uid=%08x\n",
                        dev_name(dev),
                        dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
-                       &ag->mii_bus->phy_map[phy_addr]->phy_id),
-                       &ag->mii_bus->phy_map[phy_addr]->phy_id : 0);
+                       ag->mii_bus->phy_map[phy_addr]->phy_id);
 
                if (phydev == NULL)
                        phydev = ag->mii_bus->phy_map[phy_addr];
@@ -138,8 +144,7 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
                DBG("%s: PHY found at %s, uid=%08x\n",
                        dev_name(dev),
                        dev_name(&ag->mii_bus->mdio_map[phy_addr]->dev),
-                       mdiobus_get_phy(ag->mii_bus, phy_addr) ?
-                       mdiobus_get_phy(ag->mii_bus, phy_addr)->phy_id : 0);
+                       ag->mii_bus->mdio_map[phy_addr]->phy_id);
 
                if (phydev == NULL)
                        phydev = mdiobus_get_phy(ag->mii_bus, phy_addr);