[PATCH 1/2] phy: fix blackfin build failure

[PATCH 1/2] phy: fix blackfin build failure

[Sudip Mukherjee]

The build of blackfin defconfig is failing with the error:
error: 'struct mii_bus' has no member named 'phy_map'

A new API mdiobus_get_phy() was introduced and phy_map was removed but
it was not changed here.

Fixes: 7f854420fbfe ("phy: Add API for {un}registering an mdio device to a bus.")
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

build log of next-20160108 is at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/101006125

 drivers/net/ethernet/adi/bfin_mac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index 6286274..6f3432a 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -398,7 +398,8 @@ static int mii_probe(struct net_device *dev, int phy_mode)
 
 	/* search for connected PHY device */
 	for (i = 0; i < PHY_MAX_ADDR; ++i) {
-		struct phy_device *const tmp_phydev = lp->mii_bus->phy_map[i];
+		struct phy_device *const tmp_phydev =
+			mdiobus_get_phy(lp->mii_bus, i);
 
 		if (!tmp_phydev)
 			continue; /* no PHY here... */
-- 
1.9.1

[PATCH 2/2] bfin_mac: fix error path

[Sudip Mukherjee]

While building blackfin defconfig we were getting a build warning:
warning: label 'out_err_irq_alloc' defined but not used.

Commit e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
removed the label out_err_mdiobus_register but then mistakenly jumped to
out_err_alloc. But it was actually supposed to jump to out_err_irq_alloc.

Fixes: e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/net/ethernet/adi/bfin_mac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index 6f3432a..5ddfd0e 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1857,7 +1857,7 @@ static int bfin_mii_bus_probe(struct platform_device *pdev)
 	rc = mdiobus_register(miibus);
 	if (rc) {
 		dev_err(&pdev->dev, "Cannot register MDIO bus!\n");
-		goto out_err_alloc;
+		goto out_err_irq_alloc;
 	}
 
 	platform_set_drvdata(pdev, miibus);
-- 
1.9.1

Re: [PATCH 1/2] phy: fix blackfin build failure

[Andrew Lunn]

On Fri, Jan 08, 2016 at 04:58:14PM +0530, Sudip Mukherjee wrote:
> The build of blackfin defconfig is failing with the error:
> error: 'struct mii_bus' has no member named 'phy_map'
> 
> A new API mdiobus_get_phy() was introduced and phy_map was removed but
> it was not changed here.
> 
> Fixes: 7f854420fbfe ("phy: Add API for {un}registering an mdio device to a bus.")
> Cc: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---

Hi David.

Acked-by: Andrew Lunn <andrew@lunn.ch>

This is one more of the late 0-day reports i got. Please take these
two, along with the two fixes i posted yesterday.

     Andrew

> 
> build log of next-20160108 is at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/101006125
> 
>  drivers/net/ethernet/adi/bfin_mac.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
> index 6286274..6f3432a 100644
> --- a/drivers/net/ethernet/adi/bfin_mac.c
> +++ b/drivers/net/ethernet/adi/bfin_mac.c
> @@ -398,7 +398,8 @@ static int mii_probe(struct net_device *dev, int phy_mode)
>  
>  	/* search for connected PHY device */
>  	for (i = 0; i < PHY_MAX_ADDR; ++i) {
> -		struct phy_device *const tmp_phydev = lp->mii_bus->phy_map[i];
> +		struct phy_device *const tmp_phydev =
> +			mdiobus_get_phy(lp->mii_bus, i);
>  
>  		if (!tmp_phydev)
>  			continue; /* no PHY here... */
> -- 
> 1.9.1
> 

Re: [PATCH 1/2] phy: fix blackfin build failure

[David Miller]

From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Fri,  8 Jan 2016 16:58:14 +0530

> The build of blackfin defconfig is failing with the error:
> error: 'struct mii_bus' has no member named 'phy_map'
> 
> A new API mdiobus_get_phy() was introduced and phy_map was removed but
> it was not changed here.
> 
> Fixes: 7f854420fbfe ("phy: Add API for {un}registering an mdio device to a bus.")
> Cc: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Applied.

Re: [PATCH 2/2] bfin_mac: fix error path

[David Miller]

From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Fri,  8 Jan 2016 16:58:15 +0530

> While building blackfin defconfig we were getting a build warning:
> warning: label 'out_err_irq_alloc' defined but not used.
> 
> Commit e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
> removed the label out_err_mdiobus_register but then mistakenly jumped to
> out_err_alloc. But it was actually supposed to jump to out_err_irq_alloc.
> 
> Fixes: e7f4dc3536a4 ("mdio: Move allocation of interrupts into core")
> Cc: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Applied.