Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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
Message-Id: <20220711160519.741990-10-sean.anderson@seco.com>
In-Reply-To: <20220711160519.741990-1-sean.anderson@seco.com>
References: <20220711160519.741990-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iU0KyZ+o7gDACzP8i04Dy1KujA5OYURdic7C2zC3P9rO3eM9Bp/d09UKUUlt?=
 =?us-ascii?Q?NcH0EGuTY7nnhb6XfmNbSdy7Quc33noE6gPngmUK3hFMZsiEtwU7G3hlkL48?=
 =?us-ascii?Q?jrC60/F7We6W8AlRRDg/9cu/zyKyZ3u/UUWHBO76U3Suoh9Qv6On/SUrftrI?=
 =?us-ascii?Q?72KYAZJPSViRaLJi3AwKQsTmxqtr70AsXCc4Zhe302Ts1XvrCpJzIhPmkTIu?=
 =?us-ascii?Q?WEqgTqT330k7ny+EDNDTxnyTrx5DjQPHEEHNABQD2eUwsmQJdpo9/Gj7MVch?=
 =?us-ascii?Q?s8AwishRTeCrByEUcglPCD1LkA91/Nl+7JEIhrl9H8JD9F73nukjkDPN5Ud7?=
 =?us-ascii?Q?3fYl2nf/4pr2MmlQ4pd74p1gwpUjU5odZ9OYBOqOnuJIGKeHBKHoTC6715PZ?=
 =?us-ascii?Q?p8rInL233DqN8yz8nSpf1Nd7gASwEb7sLbrDYx5/XIXhtLJHC4TiejMqT3qG?=
 =?us-ascii?Q?Z5EWOEW99ggre6LG8e3224ITNogayi1e7lc13zMjgtYiRW5q2dWPFylbC5y6?=
 =?us-ascii?Q?8sYgMbp+YP0D62XbpwzmspPjo58egHgALYvQL8TLlbFkQVpYfkXHKI8Jb4Ry?=
 =?us-ascii?Q?ifJuq3pX1rCjRt0L3XGyXOx+CF63wxgt15hMDy26RfRR8jFy5yFYO3TiOUCs?=
 =?us-ascii?Q?HDVbPIcJ+YTc8gTJWAJOXwiXT+iryOSZ4Ssex8mcUA2QFTpRTvciDzuhe8qG?=
 =?us-ascii?Q?Dh6GF5arar29VSVF4qsFmmA5JdvaeSAsHQiOxfyqpJ+fcQTBtQ0P47fzvCgF?=
 =?us-ascii?Q?5I2DzGgEnyM4o1PT6eInVfnY0PlmhjAC+HI4U2DZvLcJsMtG7MATbujhdAGi?=
 =?us-ascii?Q?NOC+dAo7RBVge0EcvqvXFovCdTOz68Z3zbhZ9P75WHpsiWvGlqCz9EzmGY3N?=
 =?us-ascii?Q?Z9G2XaUeQNqGp6jZOCBzInxoOlB89PhcbKMNTKQy4ruGn84nzQvydmUQXc9x?=
 =?us-ascii?Q?UDzV1VFGIB+g2mfM7fYwLgbW6s9umfYOSRPWlhFkRwPQRKTujTZPBZYYSluo?=
 =?us-ascii?Q?0z7CMcL4IFVAXvAMfff76YNvX2okV6xWf2S4Lv0Nb5mLam5D+Pxq9Jp7ZJfu?=
 =?us-ascii?Q?cQ+FR6dOWnbnCjEAfbf9NOl0vYdtzCAde1IqZx2zrxvyQZvbLaAUR/75dZlW?=
 =?us-ascii?Q?YalhAKz+FRKZ0BlfQvkfS12AvR5+DU6w1DCxEV4DP7SimtMRonNwtP/EPv1+?=
 =?us-ascii?Q?S5FDjWK4aDDZtp/bGRl66qs6KMvdPKSL2j5JAfdDTWHWb2Sy9fgAr2skDFZQ?=
 =?us-ascii?Q?co0UGLT4j3FxpUV+egMOsQa9WJ3yxfPONfiGhlFuDIazRdwsuY1fLnh/vyPG?=
 =?us-ascii?Q?dctTolIMPmEfrHudKagidP0p93mBbydLABLx76AgSzzgYq7HOHMAfVwd1CcK?=
 =?us-ascii?Q?fbtEP7+RRgRVUQ1tgO0upo2ZxJbv3GQmgKzCg8aF8QDoqot+udzjMPJAwiHa?=
 =?us-ascii?Q?rR4lE0Na6ZPljAPx0gox+2yGuccYdXaJvN+S50FTyNcF9ttFi2XxiCRlExVe?=
 =?us-ascii?Q?iqggAJPQFWZcyFSAMb+MLJkOyle2F+M0sy22Jgona9RN21gYDwNTU0K7GvGu?=
 =?us-ascii?Q?gzX2x4eSWoDyh/c/EG2ZOcVLSAI3j8YXHTkrrqT4rpsuB3HFlOW+9an+fkk9?=
 =?us-ascii?Q?Zg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d362e91c-b6e4-4b78-4130-08da63573e55
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 16:05:58.8706
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: v9belI9yBAh7ol7UZ1jO4Lm2seG/6J3Jn9juLC/zofgsRSy+X2oynGAaf8lETRgaB4M1nWyTfHL3ZqvEMFEf8g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB5113
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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