Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4798a714 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

of_mdio: move of_mdio_parse_addr to header file 



The of_mdio_parse_addr() helper function is useful to other code, but
the module dependency chain causes issues.  To work around this, we can
move of_mdio_parse_addr() to be an inline function in the header file.
This gets rid of the dependencies and still allows for the reuse of
code.

Reported-by: default avatarLiviu Dudau <liviu@dudau.co.uk>
Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Fixes: 342fa196 ("mdio: mux: make child bus walking more permissive and errors more verbose")
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efe5f9c0

drivers/of/of_mdio.c

+0 −22
Original line number Diff line number Diff line
@@ -119,28 +119,6 @@ static void of_mdiobus_register_device(struct mii_bus *mdio, 
		child->name, addr);

}



int of_mdio_parse_addr(struct device *dev, const struct device_node *np)

{

	u32 addr;

	int ret;



	ret = of_property_read_u32(np, "reg", &addr);

	if (ret < 0) {

		dev_err(dev, "%s has invalid PHY address\n", np->full_name);

		return ret;

	}



	/* A PHY must have a reg property in the range [0-31] */

	if (addr >= PHY_MAX_ADDR) {

		dev_err(dev, "%s PHY address %i is too large\n",

			np->full_name, addr);

		return -EINVAL;

	}



	return addr;

}

EXPORT_SYMBOL(of_mdio_parse_addr);



/* The following is a list of PHY compatible strings which appear in

 * some DTBs. The compatible string is never matched against a PHY

 * driver, so is pointless. We only expect devices which are not PHYs

include/linux/of_mdio.h

+23 −1
Original line number Diff line number Diff line
@@ -27,11 +27,33 @@ struct phy_device *of_phy_attach(struct net_device *dev, 
				 phy_interface_t iface);



extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);

extern int of_mdio_parse_addr(struct device *dev, const struct device_node *np);

extern int of_phy_register_fixed_link(struct device_node *np);

extern void of_phy_deregister_fixed_link(struct device_node *np);

extern bool of_phy_is_fixed_link(struct device_node *np);





static inline int of_mdio_parse_addr(struct device *dev,

				     const struct device_node *np)

{

	u32 addr;

	int ret;



	ret = of_property_read_u32(np, "reg", &addr);

	if (ret < 0) {

		dev_err(dev, "%s has invalid PHY address\n", np->full_name);

		return ret;

	}



	/* A PHY must have a reg property in the range [0-31] */

	if (addr >= PHY_MAX_ADDR) {

		dev_err(dev, "%s PHY address %i is too large\n",

			np->full_name, addr);

		return -EINVAL;

	}



	return addr;

}



#else /* CONFIG_OF_MDIO */

static inline int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)

{