Commit 99df4ee1 authored by Russell King's avatar Russell King
Browse files

clk: amba-clcd: convert to clk_prepare()/clk_unprepare() 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ac3e2fa6

drivers/video/amba-clcd.c

+8 −1
Original line number Diff line number Diff line
@@ -447,6 +447,10 @@ static int clcdfb_register(struct clcd_fb *fb) 
		goto out;

	}



	ret = clk_prepare(fb->clk);

	if (ret)

		goto free_clk;



	fb->fb.device		= &fb->dev->dev;



	fb->fb.fix.mmio_start	= fb->dev->res.start;
@@ -456,7 +460,7 @@ static int clcdfb_register(struct clcd_fb *fb) 
	if (!fb->regs) {

		printk(KERN_ERR "CLCD: unable to remap registers\n");

		ret = -ENOMEM;

		goto free_clk;

		goto clk_unprep;

	}



	fb->fb.fbops		= &clcdfb_ops;
@@ -530,6 +534,8 @@ static int clcdfb_register(struct clcd_fb *fb) 
	fb_dealloc_cmap(&fb->fb.cmap);

 unmap:

	iounmap(fb->regs);

 clk_unprep:

	clk_unprepare(fb->clk);

 free_clk:

	clk_put(fb->clk);

 out:
@@ -595,6 +601,7 @@ static int clcdfb_remove(struct amba_device *dev) 
	if (fb->fb.cmap.len)

		fb_dealloc_cmap(&fb->fb.cmap);

	iounmap(fb->regs);

	clk_unprepare(fb->clk);

	clk_put(fb->clk);



	fb->board->remove(fb);