Message ID | 20200710163115.2740-3-calvin.johnson@oss.nxp.com |
---|---|
State | Changes Requested |
Delegated to: | David Miller |
Headers | show |
Series | [net-next,v5,1/6] Documentation: ACPI: DSD: Document MDIO PHY | expand |
On Fri, Jul 10, 2020 at 7:31 PM Calvin Johnson <calvin.johnson@oss.nxp.com> wrote: > > Introduce device_mdiobus_register() to register mdiobus > in cases of either DT or ACPI. ... > +/** > + * device_mdiobus_register - bring up all the PHYs on a given bus and > + * attach them to bus. This handles both DT and ACPI methods. I guess you can shrink this to fit one line. > + * @bus: target mii_bus > + * @dev: given MDIO device > + * > + * Description: Given an MDIO device and target mii bus, this function > + * calls of_mdiobus_register() for DT node and mdiobus_register() in > + * case of ACPI. > + * > + * Returns 0 on success or negative error code on failure. > + */ > +int device_mdiobus_register(struct mii_bus *bus, > + struct device *dev) It's a bit strange to have a function in device_* namespace to take a pointer to the struct device as not the first parameter...
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 46b33701ad4b..2b6f22e64ad1 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -501,6 +501,33 @@ static int mdiobus_create_device(struct mii_bus *bus, return ret; } +/** + * device_mdiobus_register - bring up all the PHYs on a given bus and + * attach them to bus. This handles both DT and ACPI methods. + * @bus: target mii_bus + * @dev: given MDIO device + * + * Description: Given an MDIO device and target mii bus, this function + * calls of_mdiobus_register() for DT node and mdiobus_register() in + * case of ACPI. + * + * Returns 0 on success or negative error code on failure. + */ +int device_mdiobus_register(struct mii_bus *bus, + struct device *dev) +{ + struct fwnode_handle *fwnode = dev_fwnode(dev); + + if (is_of_node(fwnode)) + return of_mdiobus_register(bus, to_of_node(fwnode)); + if (fwnode) { + bus->dev.fwnode = fwnode; + return mdiobus_register(bus); + } + return -ENODEV; +} +EXPORT_SYMBOL(device_mdiobus_register); + /** * __mdiobus_register - bring up all the PHYs on a given bus and attach them to bus * @bus: target mii_bus diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 898cbf00332a..f78c6a7f8eb7 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -358,6 +358,7 @@ static inline int mdiobus_c45_read(struct mii_bus *bus, int prtad, int devad, return mdiobus_read(bus, prtad, mdiobus_c45_addr(devad, regnum)); } +int device_mdiobus_register(struct mii_bus *bus, struct device *dev); int mdiobus_register_device(struct mdio_device *mdiodev); int mdiobus_unregister_device(struct mdio_device *mdiodev); bool mdiobus_is_registered_device(struct mii_bus *bus, int addr);
Introduce device_mdiobus_register() to register mdiobus in cases of either DT or ACPI. Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com> --- Changes in v5: - add description - clean up if else Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/phy/mdio_bus.c | 27 +++++++++++++++++++++++++++ include/linux/mdio.h | 1 + 2 files changed, 28 insertions(+)