lkml.org 
[lkml]   [2021]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v8 09/15] of: mdio: Refactor of_mdiobus_register_phy()
    Date
    From: Calvin Johnson <calvin.johnson@oss.nxp.com>

    Refactor of_mdiobus_register_phy() to use fwnode_mdiobus_register_phy().

    Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
    Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
    ---

    Changes in v8: None
    Changes in v7:
    - include fwnode_mdio.h

    Changes in v6: None
    Changes in v5: None
    Changes in v4: None
    Changes in v3: None
    Changes in v2: None

    drivers/net/mdio/of_mdio.c | 39 ++------------------------------------
    1 file changed, 2 insertions(+), 37 deletions(-)

    diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
    index 9b1cadfd465d..8744b1e1c2b1 100644
    --- a/drivers/net/mdio/of_mdio.c
    +++ b/drivers/net/mdio/of_mdio.c
    @@ -10,6 +10,7 @@

    #include <linux/device.h>
    #include <linux/err.h>
    +#include <linux/fwnode_mdio.h>
    #include <linux/kernel.h>
    #include <linux/module.h>
    #include <linux/netdevice.h>
    @@ -44,43 +45,7 @@ EXPORT_SYMBOL(of_mdiobus_phy_device_register);
    static int of_mdiobus_register_phy(struct mii_bus *mdio,
    struct device_node *child, u32 addr)
    {
    - struct mii_timestamper *mii_ts;
    - struct phy_device *phy;
    - bool is_c45;
    - int rc;
    - u32 phy_id;
    -
    - mii_ts = of_find_mii_timestamper(child);
    - if (IS_ERR(mii_ts))
    - return PTR_ERR(mii_ts);
    -
    - is_c45 = of_device_is_compatible(child,
    - "ethernet-phy-ieee802.3-c45");
    -
    - if (!is_c45 && !of_get_phy_id(child, &phy_id))
    - phy = phy_device_create(mdio, addr, phy_id, 0, NULL);
    - else
    - phy = get_phy_device(mdio, addr, is_c45);
    - if (IS_ERR(phy)) {
    - unregister_mii_timestamper(mii_ts);
    - return PTR_ERR(phy);
    - }
    -
    - rc = of_mdiobus_phy_device_register(mdio, phy, child, addr);
    - if (rc) {
    - unregister_mii_timestamper(mii_ts);
    - phy_device_free(phy);
    - return rc;
    - }
    -
    - /* phy->mii_ts may already be defined by the PHY driver. A
    - * mii_timestamper probed via the device tree will still have
    - * precedence.
    - */
    - if (mii_ts)
    - phy->mii_ts = mii_ts;
    -
    - return 0;
    + return fwnode_mdiobus_register_phy(mdio, of_fwnode_handle(child), addr);
    }

    static int of_mdiobus_register_device(struct mii_bus *mdio,
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-06-10 18:42    [W:4.027 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site