video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare
authorVasily Khoruzhick <anarsoul@gmail.com>
Mon, 30 Jun 2014 19:14:32 +0000 (22:14 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 1 Jul 2014 10:32:32 +0000 (13:32 +0300)
Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/s3c2410fb.c

index 81af5a63e9e1d524516c90643a975002a8c77c01..d68595dcc5fda93db0a87a605b07e6e9da8d6930 100644 (file)
@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
                goto release_irq;
        }
 
-       clk_enable(info->clk);
+       clk_prepare_enable(info->clk);
        dprintk("got and enabled clock\n");
 
        usleep_range(1000, 1100);
@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev,
 free_video_memory:
        s3c2410fb_unmap_video_memory(fbinfo);
 release_clock:
-       clk_disable(info->clk);
+       clk_disable_unprepare(info->clk);
        clk_put(info->clk);
 release_irq:
        free_irq(irq, info);
@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
        s3c2410fb_unmap_video_memory(fbinfo);
 
        if (info->clk) {
-               clk_disable(info->clk);
+               clk_disable_unprepare(info->clk);
                clk_put(info->clk);
                info->clk = NULL;
        }
@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
         * before the clock goes off again (bjd) */
 
        usleep_range(1000, 1100);
-       clk_disable(info->clk);
+       clk_disable_unprepare(info->clk);
 
        return 0;
 }
@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev)
        struct fb_info     *fbinfo = platform_get_drvdata(dev);
        struct s3c2410fb_info *info = fbinfo->par;
 
-       clk_enable(info->clk);
+       clk_prepare_enable(info->clk);
        usleep_range(1000, 1100);
 
        s3c2410fb_init_registers(fbinfo);