diff options
| author | Jérôme Pouiller <jezz@sysmic.org> | 2009-10-15 11:58:27 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 11:58:27 -0400 |
| commit | 08a7963aad03b5cf515f1e9c35e0ac9eb7dae072 (patch) | |
| tree | c7df8fe3d5f93624e6dd752d7346853b8209b764 | |
| parent | 830cb6fafc12af6c105aaaf794543e4423ca79c3 (diff) | |
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>
| -rw-r--r-- | 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 bacaa536fd51..4b22ba568b19 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) | |||
| 97 | } | 97 | } |
| 98 | EXPORT_SYMBOL(of_mdiobus_register); | 98 | EXPORT_SYMBOL(of_mdiobus_register); |
| 99 | 99 | ||
| 100 | /* Helper function for of_phy_find_device */ | ||
| 101 | static int of_phy_match(struct device *dev, void *phy_np) | ||
| 102 | { | ||
| 103 | return dev_archdata_get_node(&dev->archdata) == phy_np; | ||
| 104 | } | ||
| 105 | |||
| 100 | /** | 106 | /** |
| 101 | * of_phy_find_device - Give a PHY node, find the phy_device | 107 | * of_phy_find_device - Give a PHY node, find the phy_device |
| 102 | * @phy_np: Pointer to the phy's device tree node | 108 | * @phy_np: Pointer to the phy's device tree node |
| @@ -106,15 +112,10 @@ EXPORT_SYMBOL(of_mdiobus_register); | |||
| 106 | struct phy_device *of_phy_find_device(struct device_node *phy_np) | 112 | struct phy_device *of_phy_find_device(struct device_node *phy_np) |
| 107 | { | 113 | { |
| 108 | struct device *d; | 114 | struct device *d; |
| 109 | int match(struct device *dev, void *phy_np) | ||
| 110 | { | ||
| 111 | return dev_archdata_get_node(&dev->archdata) == phy_np; | ||
| 112 | } | ||
| 113 | |||
| 114 | if (!phy_np) | 115 | if (!phy_np) |
| 115 | return NULL; | 116 | return NULL; |
| 116 | 117 | ||
| 117 | d = bus_find_device(&mdio_bus_type, NULL, phy_np, match); | 118 | d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); |
| 118 | return d ? to_phy_device(d) : NULL; | 119 | return d ? to_phy_device(d) : NULL; |
| 119 | } | 120 | } |
| 120 | EXPORT_SYMBOL(of_phy_find_device); | 121 | EXPORT_SYMBOL(of_phy_find_device); |
