The following commit has been merged in the linux branch: commit 08a7963aad03b5cf515f1e9c35e0ac9eb7dae072 Author: Jérôme Pouiller jezz@sysmic.org Date: Thu Oct 15 09:58:27 2009 -0600

of: Remove nested function

Some toolchains dislike nested function definition, so we define function match outside of of_phy_find_device.

Signed-off-by: Jérôme Pouiller jezz@sysmic.org Acked-by: David S. Miller davem@davemloft.net Signed-off-by: Grant Likely grant.likely@secretlab.ca

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);