net: ethernet: fs_enet: simplify clock handling with devm accessors

devm_clock_get_enabled() can be used to simplify clock handling for the
PER register clock.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index c96a6b9e144530c02926534fca61a38bc5581748..ec43b71c0eba157f3266cc81a187f63b7333bd2e 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -900,14 +900,9 @@ static int fs_enet_probe(struct platform_device *ofdev)
         * but require enable to succeed when a clock was specified/found,
         * keep a reference to the clock upon successful acquisition
         */
-       clk = devm_clk_get(&ofdev->dev, "per");
-       if (!IS_ERR(clk)) {
-               ret = clk_prepare_enable(clk);
-               if (ret)
-                       goto out_deregister_fixed_link;
-
-               fpi->clk_per = clk;
-       }
+       clk = devm_clk_get_enabled(&ofdev->dev, "per");
+       if (IS_ERR(clk))
+               goto out_deregister_fixed_link;
 
        privsize = sizeof(*fep) +
                   sizeof(struct sk_buff **) *
@@ -917,7 +912,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
        ndev = alloc_etherdev(privsize);
        if (!ndev) {
                ret = -ENOMEM;
-               goto out_put;
+               goto out_deregister_fixed_link;
        }
 
        SET_NETDEV_DEV(ndev, &ofdev->dev);
@@ -979,8 +974,6 @@ out_cleanup_data:
        fep->ops->cleanup_data(ndev);
 out_free_dev:
        free_netdev(ndev);
-out_put:
-       clk_disable_unprepare(fpi->clk_per);
 out_deregister_fixed_link:
        of_node_put(fpi->phy_node);
        if (of_phy_is_fixed_link(ofdev->dev.of_node))
@@ -1001,7 +994,6 @@ static void fs_enet_remove(struct platform_device *ofdev)
        fep->ops->cleanup_data(ndev);
        dev_set_drvdata(fep->dev, NULL);
        of_node_put(fep->fpi->phy_node);
-       clk_disable_unprepare(fep->fpi->clk_per);
        if (of_phy_is_fixed_link(ofdev->dev.of_node))
                of_phy_deregister_fixed_link(ofdev->dev.of_node);
        free_netdev(ndev);

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index ee49749a3202c48b803f190267c3cf55c988f2ee..6ebb1b4404c7d22769bf77cdc30a51ed085d074d 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@ -119,8 +119,6 @@ struct fs_platform_info {
        int napi_weight;        /* NAPI weight                  */
 
        int use_rmii;           /* use RMII mode                */
-
-       struct clk *clk_per;    /* 'per' clock for register access */
 };
 
 struct fs_enet_private {