From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 1 Aug 2018 20:31:04 +0000 (+0200)
Subject: Revert "ar71xx: ag71xx_phy: Fix compilation for debug messages"
X-Git-Tag: v19.07.0-rc1~2936
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ebf59638600b3cffc5cb601cce60226c942a516;p=oweals%2Fopenwrt.git

Revert "ar71xx: ag71xx_phy: Fix compilation for debug messages"

This reverts commit 2655fbe8efb2a596aa8db92cffa817e3bf0c64ea.

The patch introduces syntax errors, revert it for now.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

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 58db559ecf..53507ab5a3 100644
--- 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
@@ -140,8 +140,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];
@@ -152,8 +151,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);