of_net: factor out repetitive code from of_get_mac_address()

of_get_mac_address() basically does the same  thing thrice, every  time with  a
different  property  name,  so it makes sense to factor out the repetitive code
into separate function. While at it, we can start using ETH_ALEN instead of the
bare number and drop unnecessary parens around the property length check.

The resulting ARM object file is 100 bytes less in size than before the patch.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>

diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index 73e14184aafebbefa9f9eccc203bd43a8c519975..d820f3edd4311821696e6045d843024166b83dfc 100644 (file)
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -38,6 +38,15 @@ int of_get_phy_mode(struct device_node *np)
 }
 EXPORT_SYMBOL_GPL(of_get_phy_mode);
 
+static const void *of_get_mac_addr(struct device_node *np, const char *name)
+{
+       struct property *pp = of_find_property(np, name, NULL);
+
+       if (pp && pp->length == ETH_ALEN && is_valid_ether_addr(pp->value))
+               return pp->value;
+       return NULL;
+}
+
 /**
  * Search the device tree for the best MAC address to use.  'mac-address' is
  * checked first, because that is supposed to contain to "most recent" MAC
@@ -58,20 +67,16 @@ EXPORT_SYMBOL_GPL(of_get_phy_mode);
 */
 const void *of_get_mac_address(struct device_node *np)
 {
-       struct property *pp;
+       const void *addr;
 
-       pp = of_find_property(np, "mac-address", NULL);
-       if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
-               return pp->value;
+       addr = of_get_mac_addr(np, "mac-address");
+       if (addr)
+               return addr;
 
-       pp = of_find_property(np, "local-mac-address", NULL);
-       if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
-               return pp->value;
+       addr = of_get_mac_addr(np, "local-mac-address");
+       if (addr)
+               return addr;
 
-       pp = of_find_property(np, "address", NULL);
-       if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
-               return pp->value;
-
-       return NULL;
+       return of_get_mac_addr(np, "address");
 }
 EXPORT_SYMBOL(of_get_mac_address);