Commit b00f7f4f authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Paolo Abeni
Browse files

net: mdio: mux-mmioreg: Simplified with scoped function 



Avoids the need for manual cleanup of_node_put() in early exits
from the loop by using for_each_available_child_of_node_scoped().

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 1dce520a

drivers/net/mdio/mdio-mux-mmioreg.c

+2 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int mdio_mux_mmioreg_switch_fn(int current_child, int desired_child, 


static int mdio_mux_mmioreg_probe(struct platform_device *pdev)

{

	struct device_node *np2, *np = pdev->dev.of_node;

	struct device_node *np = pdev->dev.of_node;

	struct mdio_mux_mmioreg_state *s;

	struct resource res;

	const __be32 *iprop;
@@ -139,20 +139,18 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev) 
	 * Verify that the 'reg' property of each child MDIO bus does not

	 * set any bits outside of the 'mask'.

	 */

	for_each_available_child_of_node(np, np2) {

	for_each_available_child_of_node_scoped(np, np2) {

		u64 reg;



		if (of_property_read_reg(np2, 0, &reg, NULL)) {

			dev_err(&pdev->dev, "mdio-mux child node %pOF is "

				"missing a 'reg' property\n", np2);

			of_node_put(np2);

			return -ENODEV;

		}

		if ((u32)reg & ~s->mask) {

			dev_err(&pdev->dev, "mdio-mux child node %pOF has "

				"a 'reg' value with unmasked bits\n",

				np2);

			of_node_put(np2);

			return -ENODEV;

		}

	}