1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index a3c2c45e29e0..0da4083ba908 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -21,12 +21,11 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/clcd.h>
+#include <linux/clk.h>
 
 #include <asm/sizes.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/clock.h>
-
-#include <asm/hardware/amba_clcd.h>
 
 #define to_clcd(info)   container_of(info, struct clcd_fb, fb)
 
@@ -346,10 +345,6 @@ static int clcdfb_register(struct clcd_fb *fb)
                 goto out;
         }
 
-        ret = clk_use(fb->clk);
-        if (ret)
-                goto free_clk;
-
         fb->fb.fix.mmio_start   = fb->dev->res.start;
         fb->fb.fix.mmio_len     = SZ_4K;
 
@@ -357,7 +352,7 @@ static int clcdfb_register(struct clcd_fb *fb)
         if (!fb->regs) {
                 printk(KERN_ERR "CLCD: unable to remap registers\n");
                 ret = -ENOMEM;
-                goto unuse_clk;
+                goto free_clk;
         }
 
         fb->fb.fbops            = &clcdfb_ops;
@@ -427,8 +422,6 @@ static int clcdfb_register(struct clcd_fb *fb)
         printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret);
 
         iounmap(fb->regs);
- unuse_clk:
-        clk_unuse(fb->clk);
  free_clk:
         clk_put(fb->clk);
  out:
@@ -489,7 +482,6 @@ static int clcdfb_remove(struct amba_device *dev)
         clcdfb_disable(fb);
         unregister_framebuffer(&fb->fb);
         iounmap(fb->regs);
-        clk_unuse(fb->clk);
         clk_put(fb->clk);
 
         fb->board->remove(fb);