diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amba-clcd.c | 9 | ||||
-rw-r--r-- | drivers/video/s3c2410fb.c | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index a3c2c45e29e0..69421c86252c 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
@@ -346,10 +346,6 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
346 | goto out; | 346 | goto out; |
347 | } | 347 | } |
348 | 348 | ||
349 | ret = clk_use(fb->clk); | ||
350 | if (ret) | ||
351 | goto free_clk; | ||
352 | |||
353 | fb->fb.fix.mmio_start = fb->dev->res.start; | 349 | fb->fb.fix.mmio_start = fb->dev->res.start; |
354 | fb->fb.fix.mmio_len = SZ_4K; | 350 | fb->fb.fix.mmio_len = SZ_4K; |
355 | 351 | ||
@@ -357,7 +353,7 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
357 | if (!fb->regs) { | 353 | if (!fb->regs) { |
358 | printk(KERN_ERR "CLCD: unable to remap registers\n"); | 354 | printk(KERN_ERR "CLCD: unable to remap registers\n"); |
359 | ret = -ENOMEM; | 355 | ret = -ENOMEM; |
360 | goto unuse_clk; | 356 | goto free_clk; |
361 | } | 357 | } |
362 | 358 | ||
363 | fb->fb.fbops = &clcdfb_ops; | 359 | fb->fb.fbops = &clcdfb_ops; |
@@ -427,8 +423,6 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
427 | printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret); | 423 | printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret); |
428 | 424 | ||
429 | iounmap(fb->regs); | 425 | iounmap(fb->regs); |
430 | unuse_clk: | ||
431 | clk_unuse(fb->clk); | ||
432 | free_clk: | 426 | free_clk: |
433 | clk_put(fb->clk); | 427 | clk_put(fb->clk); |
434 | out: | 428 | out: |
@@ -489,7 +483,6 @@ static int clcdfb_remove(struct amba_device *dev) | |||
489 | clcdfb_disable(fb); | 483 | clcdfb_disable(fb); |
490 | unregister_framebuffer(&fb->fb); | 484 | unregister_framebuffer(&fb->fb); |
491 | iounmap(fb->regs); | 485 | iounmap(fb->regs); |
492 | clk_unuse(fb->clk); | ||
493 | clk_put(fb->clk); | 486 | clk_put(fb->clk); |
494 | 487 | ||
495 | fb->board->remove(fb); | 488 | fb->board->remove(fb); |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index ce6e749db3a7..d9c08cc7ac44 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -746,7 +746,6 @@ int __init s3c2410fb_probe(struct platform_device *pdev) | |||
746 | goto release_irq; | 746 | goto release_irq; |
747 | } | 747 | } |
748 | 748 | ||
749 | clk_use(info->clk); | ||
750 | clk_enable(info->clk); | 749 | clk_enable(info->clk); |
751 | dprintk("got and enabled clock\n"); | 750 | dprintk("got and enabled clock\n"); |
752 | 751 | ||
@@ -783,7 +782,6 @@ free_video_memory: | |||
783 | s3c2410fb_unmap_video_memory(info); | 782 | s3c2410fb_unmap_video_memory(info); |
784 | release_clock: | 783 | release_clock: |
785 | clk_disable(info->clk); | 784 | clk_disable(info->clk); |
786 | clk_unuse(info->clk); | ||
787 | clk_put(info->clk); | 785 | clk_put(info->clk); |
788 | release_irq: | 786 | release_irq: |
789 | free_irq(irq,info); | 787 | free_irq(irq,info); |
@@ -828,7 +826,6 @@ static int s3c2410fb_remove(struct platform_device *pdev) | |||
828 | 826 | ||
829 | if (info->clk) { | 827 | if (info->clk) { |
830 | clk_disable(info->clk); | 828 | clk_disable(info->clk); |
831 | clk_unuse(info->clk); | ||
832 | clk_put(info->clk); | 829 | clk_put(info->clk); |
833 | info->clk = NULL; | 830 | info->clk = NULL; |
834 | } | 831 | } |