From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: Grant Likely <grant.likely@arm.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Jeremy Linton <jeremy.linton@arm.com>,
Andrew Lunn <andrew@lunn.ch>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Russell King - ARM Linux admin <linux@armlinux.org.uk>,
Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Madalin Bucur <madalin.bucur@oss.nxp.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Marcin Wojtas <mw@semihalf.com>,
Pieter Jansen Van Vuuren <pieter.jansenvv@bamboosystems.io>,
Jon <jon@solid-run.com>, Saravana Kannan <saravanak@google.com>,
Randy Dunlap <rdunlap@infradead.org>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-acpi@vger.kernel.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-arm-kernel@lists.infradead.org, linux.cj@gmail.com,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: [net-next PATCH v6 08/15] of: mdio: Refactor of_mdiobus_register_phy()
Date: Thu, 18 Feb 2021 10:56:47 +0530 [thread overview]
Message-ID: <20210218052654.28995-9-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20210218052654.28995-1-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>
---
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 | 40 +-------------------------------------
1 file changed, 1 insertion(+), 39 deletions(-)
diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index d3f7f104f1ed..a0d804cfc1f0 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -98,45 +98,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)) {
- if (mii_ts)
- unregister_mii_timestamper(mii_ts);
- return PTR_ERR(phy);
- }
-
- rc = of_mdiobus_phy_device_register(mdio, phy, child, addr);
- if (rc) {
- if (mii_ts)
- 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.17.1
next prev parent reply other threads:[~2021-02-18 5:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 5:26 [net-next PATCH v6 00/15] ACPI support for dpaa2 driver Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 01/15] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 02/15] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2021-02-18 19:05 ` Jakub Kicinski
2021-02-18 5:26 ` [net-next PATCH v6 03/15] net: phy: Introduce phy related fwnode functions Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 04/15] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 05/15] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 06/15] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 07/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2021-02-18 14:52 ` Andy Shevchenko
2021-02-18 5:26 ` Calvin Johnson [this message]
2021-02-18 5:26 ` [net-next PATCH v6 09/15] ACPI: utils: Introduce acpi_get_local_address() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 10/15] net: mdio: Add ACPI support code for mdio Calvin Johnson
2021-02-18 15:08 ` Andy Shevchenko
2021-03-08 14:11 ` Calvin Johnson
2021-03-08 14:57 ` Andy Shevchenko
2021-03-08 16:28 ` Calvin Johnson
2021-03-08 16:39 ` Andy Shevchenko
2021-02-18 5:26 ` [net-next PATCH v6 11/15] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 12/15] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 13/15] net: phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 14/15] net: phylink: Refactor phylink_of_phy_connect() Calvin Johnson
2021-02-18 5:26 ` [net-next PATCH v6 15/15] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
2021-02-18 15:04 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210218052654.28995-9-calvin.johnson@oss.nxp.com \
--to=calvin.johnson@oss.nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.com \
--cc=cristian.sovaiala@nxp.com \
--cc=davem@davemloft.net \
--cc=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.com \
--cc=grant.likely@arm.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--cc=jon@solid-run.com \
--cc=kuba@kernel.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux.cj@gmail.com \
--cc=linux@armlinux.org.uk \
--cc=madalin.bucur@oss.nxp.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pieter.jansenvv@bamboosystems.io \
--cc=rafael@kernel.org \
--cc=rdunlap@infradead.org \
--cc=saravanak@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).