From: Andrew Lunn <andrew@lunn.ch>
To: Guenter Roeck <linux@roeck-us.net>
Cc: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] net: ethernet: broadcom: Fix build errors
Date: Mon, 11 Jan 2016 00:53:09 +0100 [thread overview]
Message-ID: <20160110235309.GA25548@lunn.ch> (raw)
In-Reply-To: <1452456196-1624-1-git-send-email-linux@roeck-us.net>
On Sun, Jan 10, 2016 at 12:03:16PM -0800, Guenter Roeck wrote:
> Commit 7f854420fbfe ("phy: Add API for {un}registering an mdio device to
> a bus") introduces an API to access mii_bus structures, but missed to
> update the sb1250 driver. This results in the following build error.
>
> drivers/net/ethernet/broadcom/sb1250-mac.c: In function 'sbmac_mii_probe':
> drivers/net/ethernet/broadcom/sb1250-mac.c:2360:24: error:
> 'struct mii_bus' has no member named 'phy_map'
>
> Use phy_find_first() instead of open coding it.
>
> Commit 2220943a21e2 ("phy: Centralise print about attached phy") introduces
> the following build error.
>
> drivers/net/ethernet/broadcom/sb1250-mac.c: In function 'sbmac_mii_probe':
> drivers/net/ethernet/broadcom/sb1250-mac.c:2383:20: error: 'phydev' undeclared
>
> Fixes: 7f854420fbfe ("phy: Add API for {un}registering an mdio device to a bus")
> Fixes: 2220943a21e2 ("phy: Centralise print about attached phy")
> Cc: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
> ---
> drivers/net/ethernet/broadcom/sb1250-mac.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c
> index 768c18da510c..eacc559679bf 100644
> --- a/drivers/net/ethernet/broadcom/sb1250-mac.c
> +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c
> @@ -2354,13 +2354,8 @@ static int sbmac_mii_probe(struct net_device *dev)
> {
> struct sbmac_softc *sc = netdev_priv(dev);
> struct phy_device *phy_dev;
> - int i;
>
> - for (i = 0; i < PHY_MAX_ADDR; i++) {
> - phy_dev = sc->mii_bus->phy_map[i];
> - if (phy_dev)
> - break;
> - }
> + phy_dev = phy_find_first(sc->mii_bus);
> if (!phy_dev) {
> printk(KERN_ERR "%s: no PHY found\n", dev->name);
> return -ENXIO;
> @@ -2385,7 +2380,7 @@ static int sbmac_mii_probe(struct net_device *dev)
> SUPPORTED_Pause |
> SUPPORTED_Asym_Pause;
>
> - phy_attached_info(phydev);
> + phy_attached_info(phy_dev);
>
> phy_dev->advertising = phy_dev->supported;
>
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-01-10 23:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-10 20:03 [PATCH -next] net: ethernet: broadcom: Fix build errors Guenter Roeck
2016-01-10 23:53 ` Andrew Lunn [this message]
2016-01-11 3:06 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160110235309.GA25548@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).