From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from draco.sysmic.org (sysmic.org [88.191.45.54]) by ozlabs.org (Postfix) with ESMTP id 80457B7B78 for ; Thu, 8 Oct 2009 19:34:31 +1100 (EST) From: =?utf-8?q?J=C3=A9r=C3=B4me=20Pouiller?= To: Grant Likely Subject: [PATCH] Remove nested function Date: Thu, 8 Oct 2009 10:34:23 +0200 Message-Id: <1254990863-15271-1-git-send-email-jezz@sysmic.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: netdev , linuxppc , Andy Fleming , =?utf-8?q?J=C3=A9r=C3=B4me=20Pouiller?= , "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Some toolchains dislike nested function definition, so we define function match outside of of_phy_find_device. Signed-off-by: Jérôme Pouiller --- drivers/of/of_mdio.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index bacaa53..4b22ba5 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -97,6 +97,12 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) } EXPORT_SYMBOL(of_mdiobus_register); +/* Helper function for of_phy_find_device */ +static int of_phy_match(struct device *dev, void *phy_np) +{ + return dev_archdata_get_node(&dev->archdata) == phy_np; +} + /** * of_phy_find_device - Give a PHY node, find the phy_device * @phy_np: Pointer to the phy's device tree node @@ -106,15 +112,10 @@ EXPORT_SYMBOL(of_mdiobus_register); struct phy_device *of_phy_find_device(struct device_node *phy_np) { struct device *d; - int match(struct device *dev, void *phy_np) - { - return dev_archdata_get_node(&dev->archdata) == phy_np; - } - if (!phy_np) return NULL; - d = bus_find_device(&mdio_bus_type, NULL, phy_np, match); + d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); return d ? to_phy_device(d) : NULL; } EXPORT_SYMBOL(of_phy_find_device); -- 1.6.0.4