From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: Re: [PATCH 3/4] net: macb: Support specifying PHYs in a mdio container dts node Date: Mon, 20 Aug 2018 15:42:34 +0200 Message-ID: <20180820134234.GC6583@lunn.ch> References: <20180820121238.7779-1-a.fatoum@pengutronix.de> <20180820121238.7779-3-a.fatoum@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "David S. Miller" , Nicolas Ferre , kernel@pengutronix.de, netdev@vger.kernel.org, mdf@kernel.org, Brad Mouring , Florian Fainelli To: Ahmad Fatoum Return-path: Received: from vps0.lunn.ch ([185.16.172.187]:39092 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726683AbeHTQ6V (ORCPT ); Mon, 20 Aug 2018 12:58:21 -0400 Content-Disposition: inline In-Reply-To: <20180820121238.7779-3-a.fatoum@pengutronix.de> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, Aug 20, 2018 at 02:12:37PM +0200, Ahmad Fatoum wrote: > To align macb DT entries with those of other MACs. > For backwards compatibility, the old way remains supported. > > Suggested-by: Andrew Lunn > Signed-off-by: Ahmad Fatoum > --- > drivers/net/ethernet/cadence/macb_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index ef6ce8691443..2ebc5698db9d 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -596,10 +596,10 @@ static int macb_mii_init(struct macb *bp) > > err = mdiobus_register(bp->mii_bus); > } else { > + struct device_node *node = of_get_child_by_name(np, "mdio") ?: np; This is correct. But i would prefer the more readable struct device_node *node = of_get_child_by_name(np, "mdio"); if (!node) /* Allow for the deprecated PHYs in the MAC node. */ node = np; > if (pdata) > bp->mii_bus->phy_mask = pdata->phy_mask; > - > - err = of_mdiobus_register(bp->mii_bus, np); > + err = of_mdiobus_register(bp->mii_bus, node); > } Also, the device tree binding documentation needs updating. Thanks Andrew