From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.kymetacorp.com ([192.81.58.21]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZozCR-0002Vf-UW for barebox@lists.infradead.org; Wed, 21 Oct 2015 19:37:28 +0000 From: Trent Piepho Date: Wed, 21 Oct 2015 19:37:00 +0000 Message-ID: <1445456225.13196.122.camel@rtred1test09.kymetacorp.com> Content-Language: en-US Content-ID: <5E4A0517446E4B4288964F2014143051@kymetacorp.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/2 v2] net: eth: Refactor OF tree fixup of one node into new function To: barebox Code that fixes up one node with a new MAC address is refactored into a new function that eth_of_fixup() calls in a loop. Signed-off-by: Trent Piepho --- net/eth.c | 62 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/net/eth.c b/net/eth.c index b22e556..befa8d8 100644 --- a/net/eth.c +++ b/net/eth.c @@ -289,42 +289,48 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv) } #ifdef CONFIG_OFTREE -static int eth_of_fixup(struct device_node *root, void *unused) +static void eth_of_fixup_node(struct device_node *root, + const char *node_path, int ethid, + const u8 ethaddr[6]) { - struct eth_device *edev; struct device_node *node; int ret; + if (!is_valid_ether_addr(ethaddr)) { + pr_debug("%s: no valid mac address, cannot fixup\n", + __func__); + return; + } + + if (node_path) { + node = of_find_node_by_path_from(root, node_path); + } else { + char eth[12]; + sprintf(eth, "ethernet%d", ethid); + node = of_find_node_by_alias(root, eth); + } + + if (!node) { + pr_debug("%s: no node to fixup\n", __func__); + return; + } + + ret = of_set_property(node, "mac-address", ethaddr, 6, 1); + if (ret) + pr_err("Setting mac-address property of %s failed with: %s\n", + node->full_name, strerror(-ret)); +} + +static int eth_of_fixup(struct device_node *root, void *unused) +{ + struct eth_device *edev; + /* * Add the mac-address property for each network device we * find a nodepath for and which has a valid mac address. */ - list_for_each_entry(edev, &netdev_list, list) { - if (!is_valid_ether_addr(edev->ethaddr)) { - dev_dbg(&edev->dev, - "%s: no valid mac address, cannot fixup\n", - __func__); - continue; - } - - if (edev->nodepath) { - node = of_find_node_by_path_from(root, edev->nodepath); - } else { - char eth[12]; - sprintf(eth, "ethernet%d", edev->dev.id); - node = of_find_node_by_alias(root, eth); - } - - if (!node) { - dev_dbg(&edev->dev, "%s: no node to fixup\n", __func__); - continue; - } - - ret = of_set_property(node, "mac-address", edev->ethaddr, 6, 1); - if (ret) - pr_err("Setting mac-address property of %s failed with: %s\n", - node->full_name, strerror(-ret)); - } + list_for_each_entry(edev, &netdev_list, list) + eth_of_fixup_node(root, edev->nodepath, edev->dev.id, edev->ethaddr); return 0; } -- 1.8.3.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox