lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 11 Jun 2021 13:53:55 +0300 From: Ioana Ciornei <ciorneiioana@...il.com> To: davem@...emloft.net, kuba@...nel.org, hkallweit1@...il.com, netdev@...r.kernel.org, Grant Likely <grant.likely@....com>, "Rafael J . Wysocki" <rafael@...nel.org>, Jeremy Linton <jeremy.linton@....com>, Andrew Lunn <andrew@...n.ch>, Andy Shevchenko <andy.shevchenko@...il.com>, Florian Fainelli <f.fainelli@...il.com>, Russell King - ARM Linux admin <linux@...linux.org.uk>, Heikki Krogerus <heikki.krogerus@...ux.intel.com>, Marcin Wojtas <mw@...ihalf.com>, Pieter Jansen Van Vuuren <pieter.jansenvv@...boosystems.io>, Jon <jon@...id-run.com>, Saravana Kannan <saravanak@...gle.com>, Randy Dunlap <rdunlap@...radead.org>, calvin.johnson@....nxp.com Cc: Cristi Sovaiala <cristian.sovaiala@....com>, Florin Laurentiu Chiculita <florinlaurentiu.chiculita@....com>, Madalin Bucur <madalin.bucur@....com>, linux-arm-kernel@...ts.infradead.org, Diana Madalina Craciun <diana.craciun@....com>, linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org, linux.cj@...il.com, Laurentiu Tudor <laurentiu.tudor@....com>, Len Brown <lenb@...nel.org>, "Rafael J . Wysocki" <rjw@...ysocki.net>, Ioana Ciornei <ioana.ciornei@....com> Subject: [PATCH net-next v9 09/15] of: mdio: Refactor of_mdiobus_register_phy() From: Calvin Johnson <calvin.johnson@....nxp.com> Refactor of_mdiobus_register_phy() to use fwnode_mdiobus_register_phy(). Also, remove the of_find_mii_timestamper() since the fwnode variant is used instead. Signed-off-by: Calvin Johnson <calvin.johnson@....nxp.com> Signed-off-by: Ioana Ciornei <ioana.ciornei@....com> Acked-by: Grant Likely <grant.likely@....com> --- Changes in v9: - remove the of_find_mii_timestamper() in this patch rather the previous one 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 | 56 +------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c index 17327bbc1de4..8744b1e1c2b1 100644 --- a/drivers/net/mdio/of_mdio.c +++ b/drivers/net/mdio/of_mdio.c @@ -33,24 +33,6 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id) return fwnode_get_phy_id(of_fwnode_handle(device), phy_id); } -static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node) -{ - struct of_phandle_args arg; - int err; - - err = of_parse_phandle_with_fixed_args(node, "timestamper", 1, 0, &arg); - - if (err == -ENOENT) - return NULL; - else if (err) - return ERR_PTR(err); - - if (arg.args_count != 1) - return ERR_PTR(-EINVAL); - - return register_mii_timestamper(arg.np, arg.args[0]); -} - int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy, struct device_node *child, u32 addr) { @@ -63,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
Powered by blists - more mailing lists