From: Phil Reid <preid@electromag•com.au>
To: peppe.cavallaro@st•com
Cc: netdev@vger•kernel.org, linux-rockchip@lists•infradead.org
Subject: Re: [PATCH v2] stmmac: Don't exit mdio registration when mdio subnode is not found in the DTS
Date: Fri, 8 Jan 2016 16:04:58 +0800 [thread overview]
Message-ID: <568F6DAA.9000205@electromag.com.au> (raw)
In-Reply-To: <1452197608-29060-1-git-send-email-romain.perier@gmail.com>
On 8/01/2016 4:13 AM, Romain Perier wrote:
> Originally, most of the platforms using this driver did not define an mdio subnode
> in the devicetree. Commit e34d65 ("stmmac: create of compatible mdio bus for stmmac driver")
> introduced a backward compatibily issue by using of_mdiobus_register explicitly
> with an mdio subnode. This patch fixes the issue by calling the function
> mdiobus_register, when mdio subnode is not found. The driver is now compatible
> with both modes.
>
> Fixes: e34d65696d2e ("stmmac: create of compatible mdio bus for stmmac driver")
> Signed-off-by: Romain Perier <romain.perier@gmail•com>
> ---
>
> Changes in v2:
> - Removed IS_ENABLED macro from the if statement before calling
> of_mdiobus_register.
> - Added Fixes tag in commit message
>
> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index 16c85cc..648488d 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> @@ -218,8 +218,7 @@ int stmmac_mdio_register(struct net_device *ndev)
> if (mdio_node) {
> netdev_dbg(ndev, "FOUND MDIO subnode\n");
> } else {
> - netdev_err(ndev, "NO MDIO subnode\n");
> - return 0;
> + netdev_warn(ndev, "No MDIO subnode found\n");
> }
> }
>
> @@ -251,7 +250,10 @@ int stmmac_mdio_register(struct net_device *ndev)
> new_bus->phy_mask = mdio_bus_data->phy_mask;
> new_bus->parent = priv->device;
>
> - err = of_mdiobus_register(new_bus, mdio_node);
> + if (mdio_node)
> + err = of_mdiobus_register(new_bus, mdio_node);
> + else
> + err = mdiobus_register(new_bus);
> if (err != 0) {
> pr_err("%s: Cannot register as MDIO bus\n", new_bus->name);
> goto bus_register_fail;
>
Tested-by: Phil Reid <preid@electromag•com.au>
--
Regards
Phil Reid
next prev parent reply other threads:[~2016-01-08 8:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 20:13 [PATCH v2] stmmac: Don't exit mdio registration when mdio subnode is not found in the DTS Romain Perier
2016-01-08 8:04 ` Phil Reid [this message]
2016-01-10 23:03 ` 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=568F6DAA.9000205@electromag.com.au \
--to=preid@electromag$(echo .)com.au \
--cc=linux-rockchip@lists$(echo .)infradead.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peppe.cavallaro@st$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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