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: Laurentiu Tudor <laurentiu.tudor@nxp.com>,
linux-kernel@vger.kernel.org, linux.cj@gmail.com,
Diana Madalina Craciun <diana.craciun@nxp.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-acpi@vger.kernel.org,
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 v5 14/15] net: phylink: Refactor phylink_of_phy_connect()
Date: Mon, 8 Feb 2021 20:42:43 +0530 [thread overview]
Message-ID: <20210208151244.16338-15-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20210208151244.16338-1-calvin.johnson@oss.nxp.com>
Refactor phylink_of_phy_connect() to use phylink_fwnode_phy_connect().
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/net/phy/phylink.c | 39 +--------------------------------------
1 file changed, 1 insertion(+), 38 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 5466e1e6272a..3d0dc53fd4f3 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1080,44 +1080,7 @@ EXPORT_SYMBOL_GPL(phylink_connect_phy);
int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn,
u32 flags)
{
- struct device_node *phy_node;
- struct phy_device *phy_dev;
- int ret;
-
- /* Fixed links and 802.3z are handled without needing a PHY */
- if (pl->cfg_link_an_mode == MLO_AN_FIXED ||
- (pl->cfg_link_an_mode == MLO_AN_INBAND &&
- phy_interface_mode_is_8023z(pl->link_interface)))
- return 0;
-
- phy_node = of_parse_phandle(dn, "phy-handle", 0);
- if (!phy_node)
- phy_node = of_parse_phandle(dn, "phy", 0);
- if (!phy_node)
- phy_node = of_parse_phandle(dn, "phy-device", 0);
-
- if (!phy_node) {
- if (pl->cfg_link_an_mode == MLO_AN_PHY)
- return -ENODEV;
- return 0;
- }
-
- phy_dev = of_phy_find_device(phy_node);
- /* We're done with the phy_node handle */
- of_node_put(phy_node);
- if (!phy_dev)
- return -ENODEV;
-
- ret = phy_attach_direct(pl->netdev, phy_dev, flags,
- pl->link_interface);
- if (ret)
- return ret;
-
- ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
- if (ret)
- phy_detach(phy_dev);
-
- return ret;
+ return phylink_fwnode_phy_connect(pl, of_fwnode_handle(dn), flags);
}
EXPORT_SYMBOL_GPL(phylink_of_phy_connect);
--
2.17.1
next prev parent reply other threads:[~2021-02-08 17:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 15:12 [net-next PATCH v5 00/15] ACPI support for dpaa2 driver Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 01/15] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2021-02-08 20:01 ` Randy Dunlap
2021-02-09 14:34 ` Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 02/15] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 03/15] net: phy: Introduce phy related fwnode functions Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 04/15] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 05/15] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 06/15] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 07/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2021-02-08 17:40 ` Russell King - ARM Linux admin
2021-02-09 15:04 ` Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 08/15] of: mdio: Refactor of_mdiobus_register_phy() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 09/15] ACPI: utils: Introduce acpi_get_local_address() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 10/15] net: mdio: Add ACPI support code for mdio Calvin Johnson
2021-02-08 16:16 ` Andy Shevchenko
2021-02-08 15:12 ` [net-next PATCH v5 11/15] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 12/15] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2021-02-08 15:12 ` [net-next PATCH v5 13/15] phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2021-02-08 15:31 ` Russell King - ARM Linux admin
2021-02-15 5:55 ` Calvin Johnson
2021-02-15 6:01 ` Calvin Johnson
2021-02-08 16:20 ` Russell King - ARM Linux admin
2021-02-08 15:12 ` Calvin Johnson [this message]
2021-02-08 15:12 ` [net-next PATCH v5 15/15] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
2021-02-08 16:21 ` Andy Shevchenko
2021-02-08 16:28 ` Russell King - ARM Linux admin
2021-02-15 12:33 ` Calvin Johnson
2021-02-15 15:13 ` Andy Shevchenko
2021-02-15 15:15 ` Andy Shevchenko
2021-02-16 9:59 ` Calvin Johnson
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=20210208151244.16338-15-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).