From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780AbcD1X0h (ORCPT ); Thu, 28 Apr 2016 19:26:37 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:34202 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbcD1X0f (ORCPT ); Thu, 28 Apr 2016 19:26:35 -0400 From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, nathan.sullivan@ni.com, nicolas.ferre@atmel.com, Florian Fainelli , Rob Herring , Frank Rowand , Grant Likely , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v2] of: of_mdio: Check if MDIO bus controller is available Date: Thu, 28 Apr 2016 16:24:12 -0700 Message-Id: <1461885853-28846-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a check whether the 'struct device_node' pointer passed to of_mdiobus_register() is an available (aka enabled) node in the Device Tree. Rationale for doing this are cases where an Ethernet MAC provides a MDIO bus controller and node, and an additional Ethernet MAC might be connecting its PHY/switches to that first MDIO bus controller, while still embedding one internally which is therefore marked as "disabled". Instead of sprinkling checks like these in callers of of_mdiobus_register(), do this in a central location. Reviewed-by: Andrew Lunn Signed-off-by: Florian Fainelli --- Changes in v2: - utilize -ENODEV instead of -EINVAL - added Andrew's reviewed-by tag drivers/of/of_mdio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index b622b33dbf93..e051e1b57609 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -209,6 +209,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) bool scanphys = false; int addr, rc; + /* Do not continue if the node is disabled */ + if (!of_device_is_available(np)) + return -ENODEV; + /* Mask out all PHYs from auto probing. Instead the PHYs listed in * the device tree are populated after the bus has been registered */ mdio->phy_mask = ~0; -- 2.1.0