net: stmmac: rk: convert to init()/exit() methods

Convert rk to use the init() and exit() methods for powering up and
down the device. This allows us to use the pltfr versions of probe()
and remove().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vLf2e-0000000FMNN-1Xnh@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 6e75da577af5d1740a964e89509fe13e86d2b326..6bfe82d7001ae9060c45169c8bcccb900c9c82d7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1763,6 +1763,22 @@ static int rk_gmac_resume(struct device *dev, void *bsp_priv_)
        return 0;
 }
 
+static int rk_gmac_init(struct device *dev, void *bsp_priv)
+{
+       return rk_gmac_powerup(bsp_priv);
+}
+
+static void rk_gmac_exit(struct device *dev, void *bsp_priv_)
+{
+       struct stmmac_priv *priv = netdev_priv(dev_get_drvdata(dev));
+       struct rk_priv_data *bsp_priv = bsp_priv_;
+
+       rk_gmac_powerdown(bsp_priv);
+
+       if (priv->plat->phy_node && bsp_priv->integrated_phy)
+               clk_put(bsp_priv->clk_phy);
+}
+
 static int rk_gmac_probe(struct platform_device *pdev)
 {
        struct plat_stmmacenet_data *plat_dat;
@@ -1795,6 +1811,8 @@ static int rk_gmac_probe(struct platform_device *pdev)
 
        plat_dat->get_interfaces = rk_get_interfaces;
        plat_dat->set_clk_tx_rate = rk_set_clk_tx_rate;
+       plat_dat->init = rk_gmac_init;
+       plat_dat->exit = rk_gmac_exit;
        plat_dat->suspend = rk_gmac_suspend;
        plat_dat->resume = rk_gmac_resume;
 
@@ -1806,33 +1824,7 @@ static int rk_gmac_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = rk_gmac_powerup(plat_dat->bsp_priv);
-       if (ret)
-               return ret;
-
-       ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
-       if (ret)
-               goto err_gmac_powerdown;
-
-       return 0;
-
-err_gmac_powerdown:
-       rk_gmac_powerdown(plat_dat->bsp_priv);
-
-       return ret;
-}
-
-static void rk_gmac_remove(struct platform_device *pdev)
-{
-       struct stmmac_priv *priv = netdev_priv(platform_get_drvdata(pdev));
-       struct rk_priv_data *bsp_priv = priv->plat->bsp_priv;
-
-       stmmac_dvr_remove(&pdev->dev);
-
-       rk_gmac_powerdown(bsp_priv);
-
-       if (priv->plat->phy_node && bsp_priv->integrated_phy)
-               clk_put(bsp_priv->clk_phy);
+       return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
 }
 
 static const struct of_device_id rk_gmac_dwmac_match[] = {
@@ -1858,7 +1850,6 @@ MODULE_DEVICE_TABLE(of, rk_gmac_dwmac_match);
 
 static struct platform_driver rk_gmac_dwmac_driver = {
        .probe  = rk_gmac_probe,
-       .remove = rk_gmac_remove,
        .driver = {
                .name           = "rk_gmac-dwmac",
                .pm             = &stmmac_simple_pm_ops,