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:     Vladimir Oltean <olteanv@gmail.com>,
        Eric Dumazet <edumazet@google.com>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org,
        Andrew Lunn <andrew@lunn.ch>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        Madalin Bucur <madalin.bucur@nxp.com>,
        "David S . Miller" <davem@davemloft.net>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v2 11/11] [DO NOT MERGE] net: pcs: lynx: Remove non-device functionality
Date:   Thu,  3 Nov 2022 17:06:50 -0400
Message-Id: <20221103210650.2325784-12-sean.anderson@seco.com>
In-Reply-To: <20221103210650.2325784-1-sean.anderson@seco.com>
References: <20221103210650.2325784-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?Hu8ZkmU1BxS9k4YqEIIN3vkPNlDk/lNIOKOdExCNuRZoO7rfL2qsFeHPJ5wL?=
 =?us-ascii?Q?eymijk+wywqtz1zyXLDCyz8VfOHEM0bvh6GWgaMiggs+a84nkxqty777Ylid?=
 =?us-ascii?Q?tdX9tr0udJMqxXkivLtTlUJ6c5VE6cJIMswTMpbPfhrFhmHLDx7PdHXpzEn4?=
 =?us-ascii?Q?8iI07W1fxo80DWy6+JGyN17VSPhNlcLNsFm98KSAL1oP3QKdEJ0vtvPV3NvY?=
 =?us-ascii?Q?1LqQnXJ82dgVaRFkgtYIO+K2HzE7UdBxU0yKJTbT3U8P3mlhA6rDnWBOfOvn?=
 =?us-ascii?Q?jL7rozxtfZVm1+9/Rh7zFV3u81qWMGmseXo+UYYszRThd0qFWWSZHiOoDiqX?=
 =?us-ascii?Q?tLPV4sSiDnlrHwSyKDS2GyYpATHns9YhKfxC+XGbEjCojsHPWJQxsivPfVKg?=
 =?us-ascii?Q?qVrKdWx7kaWaUDsvsMbjaYnjalA7RKQI7tE1b0qioCdyg/S+xXOLMHhQLeYU?=
 =?us-ascii?Q?fndNWdV5trgFr+lcp7V1Oy296AgHvogaTgKRYEbMhTL+TK6i0Xdikunn9mTM?=
 =?us-ascii?Q?T9ip8Z4xPTrmXHINnIyfqI2f13VaUQ3PsqsHFJMWg5FqcZzjk/fnw5HmG6S3?=
 =?us-ascii?Q?xKnQKzHAncBmFZpy30nvQJClb7q4vr8MVGg6n6f58CwQQOKbskomDfSSitCp?=
 =?us-ascii?Q?zlf/BLVLZrXvlIVhOUTTs0si5f96a+Zsjkwu4+fHkKUvc9jnahYGWsA3GFRH?=
 =?us-ascii?Q?tlNrvcA2ySsbMji14JxnQvTvUwzDoDhhXEt+JEsUE+O4T8x9+uSZYQqa1SN0?=
 =?us-ascii?Q?GcTPb0xXXSBi5V9WTxD1K/tK3VHR+yCssd/AP7SHvwAYz7iCOTbKVdxRLbZn?=
 =?us-ascii?Q?dyY8d4x4eB25FsVpVeTb8a5Q3EPyRBhzvnMhdtr1/7s38yeuMg5H8c9PTamM?=
 =?us-ascii?Q?QQUG/k4Ve1IyyCSE8gqqqdoziT4E/WFAHXBH02t2qQEm5yiWa8sVMXlYRml3?=
 =?us-ascii?Q?5eugS6ux8jy00rFRlYqdksqIgrhUeupgLfw6nY+s5WGuHRxdYyaUFWb0mlbd?=
 =?us-ascii?Q?THFxaBVTJtnSrapd2pEWt2GJA5XaT3lD87QBeB30l4PPL4mQNcH4DwpJB9qy?=
 =?us-ascii?Q?ekW4dS2p62/TqKEMMToumQvRGKHbuWf7236ep2gENsET/yRvrrzsPGHEw5Pk?=
 =?us-ascii?Q?+RpuB2dHJbZ5to1oxDNKVg8wVoIN0cbsqWBOQAsWLvBwAdOXpiqkaDVH7JTC?=
 =?us-ascii?Q?OI/c8esvFh09ro+kBT4a9rr0hhfSPTxFvhgXO5YdoALjL7v7SMmQjtFVSjwz?=
 =?us-ascii?Q?KceghaRqx1OHZx5HPHuHbTZpU1NU5rcICmGyUNHUUN2dUXpgRkmhSWklsghx?=
 =?us-ascii?Q?irjSRK3XX3ZBLFcEHwJduGNI4fZQEyL762nMxxZ3EYYN9yOQmuQIM2P/WAGz?=
 =?us-ascii?Q?iNTL9ZFAQY+kUduyE8kVrUUPg5nDNf5Qwv7Fh47WbnSrks7nt++HFfjfP5qZ?=
 =?us-ascii?Q?vDRCczFr7ktnnr1mjjSSoisSkOdZKGnPH8JlEp4kVBwXSSfJ6wOopfTXEU41?=
 =?us-ascii?Q?weLQN6fKv60E/xZfwR+dykhNz4jUl720qVaoWxsKw4hIVoUPB/8ND9DUM5z/?=
 =?us-ascii?Q?SD3y42RJuTWn3c4ju8e0ZNDRGEv8YhwlUKGZrpQtY8xAYKq5k/kYh+9ObNMN?=
 =?us-ascii?Q?uQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 413f4757-3282-4121-b8c4-08dabddf65d5
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 21:07:21.2083
 (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: tpH8wjxme3cFeVFRCMOEnZgGMjupaRInLDPX/iv/qlR6sG/dE/g96D9vqiGOzneI2iJCN0AGPp5GaGLD4jwYeA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7746
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 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

As all former consumers of non-device lynx PCSs have been removed, we
can now remove the remaining functions retained for backwards-
compatibility.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(no changes since v1)

 drivers/net/pcs/pcs-lynx.c | 51 +++++---------------------------------
 include/linux/pcs-lynx.h   |  5 ----
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/drivers/net/pcs/pcs-lynx.c b/drivers/net/pcs/pcs-lynx.c
index 3ea402049ef1..df9e8ad3f728 100644
--- a/drivers/net/pcs/pcs-lynx.c
+++ b/drivers/net/pcs/pcs-lynx.c
@@ -38,15 +38,6 @@ enum sgmii_speed {
 };
 
 #define phylink_pcs_to_lynx(pl_pcs) container_of((pl_pcs), struct lynx_pcs, pcs)
-#define lynx_to_phylink_pcs(lynx) (&(lynx)->pcs)
-
-struct mdio_device *lynx_get_mdio_device(struct phylink_pcs *pcs)
-{
-	struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs);
-
-	return lynx->mdio;
-}
-EXPORT_SYMBOL(lynx_get_mdio_device);
 
 static void lynx_pcs_get_state_usxgmii(struct mdio_device *pcs,
 				       struct phylink_link_state *state)
@@ -322,57 +313,28 @@ static const struct phylink_pcs_ops lynx_pcs_phylink_ops = {
 	.pcs_link_up = lynx_pcs_link_up,
 };
 
-struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio)
+static int lynx_pcs_probe(struct mdio_device *mdio)
 {
+	struct device *dev = &mdio->dev;
 	struct lynx_pcs *lynx;
+	int ret;
 
 	lynx = kzalloc(sizeof(*lynx), GFP_KERNEL);
 	if (!lynx)
-		return NULL;
+		return -ENOMEM;
 
 	lynx->mdio = mdio;
+	lynx->pcs.dev = dev;
 	lynx->pcs.ops = &lynx_pcs_phylink_ops;
 	lynx->pcs.poll = true;
 
-	return lynx_to_phylink_pcs(lynx);
-}
-EXPORT_SYMBOL_GPL(lynx_pcs_create);
-
-static int lynx_pcs_probe(struct mdio_device *mdio)
-{
-	struct device *dev = &mdio->dev;
-	struct phylink_pcs *pcs;
-	int ret;
-
-	pcs = lynx_pcs_create(mdio);
-	if (!pcs)
-		return -ENOMEM;
-
-	dev_set_drvdata(dev, pcs);
-	pcs->dev = dev;
-	ret = pcs_register(pcs);
+	ret = devm_pcs_register(dev, &lynx->pcs);
 	if (ret)
 		return dev_err_probe(dev, ret, "could not register PCS\n");
 	dev_info(dev, "probed\n");
 	return 0;
 }
 
-void lynx_pcs_destroy(struct phylink_pcs *pcs)
-{
-	struct lynx_pcs *lynx = phylink_pcs_to_lynx(pcs);
-
-	kfree(lynx);
-}
-EXPORT_SYMBOL(lynx_pcs_destroy);
-
-static void lynx_pcs_remove(struct mdio_device *mdio)
-{
-	struct phylink_pcs *pcs = dev_get_drvdata(&mdio->dev);
-
-	pcs_unregister(pcs);
-	lynx_pcs_destroy(pcs);
-}
-
 static const struct of_device_id lynx_pcs_of_match[] = {
 	{ .compatible = "fsl,lynx-pcs" },
 	{ },
@@ -381,7 +343,6 @@ MODULE_DEVICE_TABLE(of, lynx_pcs_of_match);
 
 static struct mdio_driver lynx_pcs_driver = {
 	.probe = lynx_pcs_probe,
-	.remove = lynx_pcs_remove,
 	.mdiodrv.driver = {
 		.name = "lynx-pcs",
 		.of_match_table = of_match_ptr(lynx_pcs_of_match),
diff --git a/include/linux/pcs-lynx.h b/include/linux/pcs-lynx.h
index ef073b28fae9..f8fe134c63e5 100644
--- a/include/linux/pcs-lynx.h
+++ b/include/linux/pcs-lynx.h
@@ -10,12 +10,7 @@ struct device;
 struct mii_bus;
 struct phylink_pcs;
 
-struct mdio_device *lynx_get_mdio_device(struct phylink_pcs *pcs);
-
-struct phylink_pcs *lynx_pcs_create(struct mdio_device *mdio);
 struct phylink_pcs *lynx_pcs_create_on_bus(struct device *dev,
 					   struct mii_bus *bus, int addr);
 
-void lynx_pcs_destroy(struct phylink_pcs *pcs);
-
 #endif /* __LINUX_PCS_LYNX_H */
-- 
2.35.1.1320.gc452695387.dirty