From: Sean Anderson <sean.anderson@seco.com>
To: Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org
Cc: Jakub Kicinski <kuba@kernel.org>,
Madalin Bucur <madalin.bucur@nxp.com>,
"David S . Miller" <davem@davemloft.net>,
Paolo Abeni <pabeni@redhat.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
Andrew Lunn <andrew@lunn.ch>,
Sean Anderson <sean.anderson@seco.com>
Subject: [RFC PATCH net-next 9/9] net: pcs: lynx: Remove remaining users of lynx_pcs_create
Date: Mon, 11 Jul 2022 12:05:19 -0400 [thread overview]
Message-ID: <20220711160519.741990-10-sean.anderson@seco.com> (raw)
In-Reply-To: <20220711160519.741990-1-sean.anderson@seco.com>
Now that PCS devices have a compatible string, we no longer have to bind
the driver manually in lynx_pcs_create. Remove it, and convert the
remaining users to pcs_get_by_fwnode.
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
This requires that all PCSs have a compatible string. For a reasonable
window of compatibility, this should be applied one major release after
all compatible strings are added.
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 27 ++-----------------
drivers/net/pcs/pcs-lynx.c | 19 -------------
include/linux/pcs-lynx.h | 1 -
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index d8b491ffa4db..1c1cd935ec1d 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -247,32 +247,9 @@ static int dpaa2_pcs_create(struct dpaa2_mac *mac,
struct fwnode_handle *dpmac_node,
int id)
{
- struct mdio_device *mdiodev;
- struct fwnode_handle *node;
-
- node = fwnode_find_reference(dpmac_node, "pcs-handle", 0);
- if (IS_ERR(node)) {
- /* do not error out on old DTS files */
- netdev_warn(mac->net_dev, "pcs-handle node not found\n");
- return 0;
- }
-
- if (!fwnode_device_is_available(node)) {
- netdev_err(mac->net_dev, "pcs-handle node not available\n");
- fwnode_handle_put(node);
- return -ENODEV;
- }
-
- mdiodev = fwnode_mdio_find_device(node);
- fwnode_handle_put(node);
- if (!mdiodev)
- return -EPROBE_DEFER;
-
- mac->pcs = lynx_pcs_create(mdiodev);
- mdio_device_free(mdiodev);
+ mac->pcs = pcs_get_by_fwnode(dpmac_node, NULL);
if (IS_ERR(mac->pcs)) {
- netdev_err(mac->net_dev, "lynx_pcs_create() failed\n");
- put_device(&mdiodev->dev);
+ netdev_err(mac->net_dev, "pcs_get_by_fwnode() failed\n");
return PTR_ERR(mac->pcs);
}
diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c
index bfa72d9cbcf9..f4a70a1a73fe 100644
--- a/drivers/net/pcs/pcs-lynx.c
+++ b/drivers/net/pcs/pcs-lynx.c
@@ -376,25 +376,6 @@ static struct mdio_driver lynx_pcs_driver = {
};
mdio_module_driver(lynx_pcs_driver);
-struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio)
-{
- struct device *dev = &mdio->dev;
- int err;
-
- /* For compatibility with device trees lacking compatible strings, we
- * bind the device manually here.
- */
- err = device_driver_attach(&lynx_pcs_driver.mdiodrv.driver, dev);
- if (err && err != -EBUSY) {
- if (err == -EAGAIN)
- err = -EPROBE_DEFER;
- return ERR_PTR(err);
- }
-
- return pcs_get_by_provider(&mdio->dev);
-}
-EXPORT_SYMBOL(lynx_pcs_create);
-
struct phylink_pcs *lynx_pcs_create_on_bus(struct mii_bus *bus, int addr)
{
struct mdio_device *mdio;
diff --git a/include/linux/pcs-lynx.h b/include/linux/pcs-lynx.h
index 61caa59a069c..54dacabc0884 100644
--- a/include/linux/pcs-lynx.h
+++ b/include/linux/pcs-lynx.h
@@ -9,7 +9,6 @@
#include <linux/mdio.h>
#include <linux/phylink.h>
-struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio);
struct phylink_pcs *lynx_pcs_create_on_bus(struct mii_bus *bus, int addr);
#endif /* __LINUX_PCS_LYNX_H */
--
2.35.1.1320.gc452695387.dirty
next prev parent reply other threads:[~2022-07-11 16:07 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 16:05 [RFC PATCH net-next 0/9] net: pcs: Add support for devices probed in the "usual" manner Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 1/9] dt-bindings: net: Add lynx PCS Sean Anderson
2022-07-12 8:47 ` Krzysztof Kozlowski
2022-07-12 14:57 ` Sean Anderson
2022-07-12 15:00 ` Krzysztof Kozlowski
2022-07-12 15:06 ` Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 2/9] dt-bindings: net: Expand pcs-handle to an array Sean Anderson
2022-07-12 8:51 ` Krzysztof Kozlowski
2022-07-12 15:06 ` Sean Anderson
2022-07-12 15:18 ` Krzysztof Kozlowski
2022-07-12 15:23 ` Sean Anderson
2022-07-12 15:59 ` Russell King (Oracle)
2022-07-14 10:45 ` Krzysztof Kozlowski
2022-07-18 19:46 ` Rob Herring
2022-07-11 16:05 ` [RFC PATCH net-next 3/9] net: pcs: Add helpers for registering and finding PCSs Sean Anderson
2022-07-11 19:42 ` Saravana Kannan
2022-07-11 19:53 ` Sean Anderson
2022-07-11 20:59 ` Russell King (Oracle)
2022-07-11 21:47 ` Sean Anderson
2022-07-11 21:55 ` Sean Anderson
2022-07-12 15:51 ` Russell King (Oracle)
2022-07-12 23:15 ` Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 4/9] net: pcs: lynx: Convert to an mdio driver Sean Anderson
2022-07-19 16:01 ` Vladimir Oltean
2022-07-19 16:16 ` Sean Anderson
2022-07-19 16:20 ` Vladimir Oltean
2022-07-11 16:05 ` [RFC PATCH net-next 5/9] net: pcs: lynx: Use pcs_get_by_provider to get PCS Sean Anderson
2022-07-19 17:26 ` Vladimir Oltean
2022-07-19 19:41 ` Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 6/9] net: pcs: lynx: Remove lynx_get_mdio_device and lynx_pcs_destroy Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 7/9] arm64: dts: Add compatible strings for Lynx PCSs Sean Anderson
2022-07-11 16:05 ` [RFC PATCH net-next 8/9] powerpc: " Sean Anderson
2022-07-11 16:05 ` Sean Anderson [this message]
2022-07-18 19:44 ` [RFC PATCH net-next 9/9] net: pcs: lynx: Remove remaining users of lynx_pcs_create Rob Herring
2022-07-19 15:25 ` [RFC PATCH net-next 0/9] net: pcs: Add support for devices probed in the "usual" manner Vladimir Oltean
2022-07-19 15:28 ` Sean Anderson
2022-07-19 15:38 ` Vladimir Oltean
2022-07-19 15:46 ` Sean Anderson
2022-07-19 18:11 ` Vladimir Oltean
2022-07-19 19:34 ` Sean Anderson
2022-07-20 13:53 ` Vladimir Oltean
2022-07-21 21:42 ` Sean Anderson
[not found] ` <8622e12e-66c9-e338-27a1-07e53390881e@seco.com>
2022-07-29 22:15 ` Sean Anderson
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=20220711160519.741990-10-sean.anderson@seco.com \
--to=sean.anderson@seco.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).