MLK-15990 imx: mlb: change mlb clock name
authorGao Pan <pandy.gao@nxp.com>
Fri, 14 Jul 2017 09:50:33 +0000 (17:50 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:33:38 +0000 (15:33 -0500)
change mlb clock name from clk_mlb3p to mlb.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
drivers/mxc/mlb/mxc_mlb.c

index 287cb62..271e3e2 100755 (executable)
@@ -368,7 +368,7 @@ struct mlb_dev_info {
 struct mlb_data {
        struct device *dev;
        struct mlb_dev_info *devinfo;
-       struct clk *clk_mlb3p;
+       struct clk *mlb;
        struct cdev cdev;
        struct class *class;    /* device class */
        dev_t firstdev;
@@ -1939,7 +1939,7 @@ static int mxc_mlb150_open(struct inode *inode, struct file *filp)
                return -EBUSY;
        }
 
-       clk_prepare_enable(drvdata->clk_mlb3p);
+       clk_prepare_enable(drvdata->mlb);
 
        /* initial MLB module */
        mlb150_dev_init();
@@ -2029,7 +2029,7 @@ static int mxc_mlb150_release(struct inode *inode, struct file *filp)
 
        atomic_set(&pdevinfo->on, 0);
 
-       clk_disable_unprepare(drvdata->clk_mlb3p);
+       clk_disable_unprepare(drvdata->mlb);
        /* decrease the open count */
        atomic_set(&pdevinfo->opencnt, 0);
 
@@ -2664,10 +2664,10 @@ static int mxc_mlb150_probe(struct platform_device *pdev)
 #endif
 
        /* enable clock */
-       drvdata->clk_mlb3p = devm_clk_get(&pdev->dev, "mlb");
-       if (IS_ERR(drvdata->clk_mlb3p)) {
+       drvdata->mlb = devm_clk_get(&pdev->dev, "mlb");
+       if (IS_ERR(drvdata->mlb)) {
                dev_err(&pdev->dev, "unable to get mlb clock\n");
-               ret = PTR_ERR(drvdata->clk_mlb3p);
+               ret = PTR_ERR(drvdata->mlb);
                goto err_dev;
        }
 
@@ -2700,7 +2700,7 @@ static int mxc_mlb150_remove(struct platform_device *pdev)
        struct mlb_dev_info *pdevinfo = drvdata->devinfo;
 
        if (pdevinfo && atomic_read(&pdevinfo->opencnt))
-               clk_disable_unprepare(drvdata->clk_mlb3p);
+               clk_disable_unprepare(drvdata->mlb);
 
        /* disable mlb power */
 #ifdef CONFIG_REGULATOR
@@ -2730,7 +2730,7 @@ static int mxc_mlb150_suspend(struct platform_device *pdev, pm_message_t state)
 
        if (pdevinfo && atomic_read(&pdevinfo->opencnt)) {
                mlb150_dev_exit();
-               clk_disable_unprepare(drvdata->clk_mlb3p);
+               clk_disable_unprepare(drvdata->mlb);
        }
 
        return 0;
@@ -2742,7 +2742,7 @@ static int mxc_mlb150_resume(struct platform_device *pdev)
        struct mlb_dev_info *pdevinfo = drvdata->devinfo;
 
        if (pdevinfo && atomic_read(&pdevinfo->opencnt)) {
-               clk_prepare_enable(drvdata->clk_mlb3p);
+               clk_prepare_enable(drvdata->mlb);
                mlb150_dev_init();
        }