of_mdio: kill useless variable in of_mdiobus_register()

PATCH Applied Sergei Shtylyov 2 participants 2 messages Feb 28, 2016 – Mar 1, 2016

Subsystems (3)

Networking Network drivers Device tree

lore

Share & tools

lore

Sergei Shtylyov

author

2016-02-28 18:56 UTC #0 lore raw

PATCH 1/1 of_mdio: kill useless variable in of_mdiobus_register()

of_mdiobus_register() declares the 'paddr' variable to hold the result of the of_get_property() but only uses it once after that while the function can be called directly from the *if* statement. Remove that variable and switch to calling of_find_property() instead since we don't care about the "reg" property's value anyway...

Signed-off-by Sergei Shtylyov <[email protected]>

---
The patch is against DaveM's 'net-next.git' repo.

drivers/of/of_mdio.c | 4 +---

 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/of/of_mdio.c +1 -3

Index: net-next/drivers/of/of_mdio.c
===================================================================
@@ -211,7 +211,6 @@ static bool of_mdiobus_child_is_phy(stru
 int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 {
 	struct device_node *child;
-	const __be32 *paddr;
 	bool scanphys = false;
 	int addr, rc;

@@ -246,8 +245,7 @@ int of_mdiobus_register(struct mii_bus *
 	/* auto scan for PHYs with empty reg property */
 	for_each_available_child_of_node(np, child) {
 		/* Skip PHYs with reg property set */
-		paddr = of_get_property(child, "reg", NULL);
-		if (paddr)
+		if (of_find_property(child, "reg", NULL))
 			continue;
 
 		for (addr = 0; addr < PHY_MAX_ADDR; addr++) {

David Miller

maintainer Applied

2016-03-01 22:42 UTC #1 lore raw

From: Sergei Shtylyov <[email protected]>
Date: Sun, 28 Feb 2016 21:56:34 +0300

Quoted 10 lines

of_mdiobus_register() declares the 'paddr' variable to hold the result of the of_get_property() but only uses it once after that while the function can be called directly from the *if* statement. Remove that variable and switch to calling of_find_property() instead since we don't care about the "reg" property's value anyway...
Signed-off-by Sergei Shtylyov <[email protected]>
---
The patch is against DaveM's 'net-next.git' repo.

Applied.