hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-09-22 12:34:31 +01:00
parent ac3e2fa677
commit 99df4ee107
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/amba-clcd.c
View File

@ -447,6 +447,10 @@ static int clcdfb_register(struct clcd_fb *fb)
goto out; goto out;
} }
ret = clk_prepare(fb->clk);
if (ret)
goto free_clk;
fb->fb.device = &fb->dev->dev; fb->fb.device = &fb->dev->dev;
fb->fb.fix.mmio_start = fb->dev->res.start; fb->fb.fix.mmio_start = fb->dev->res.start;
@ -456,7 +460,7 @@ static int clcdfb_register(struct clcd_fb *fb)
if (!fb->regs) { if (!fb->regs) {
printk(KERN_ERR "CLCD: unable to remap registers\n"); printk(KERN_ERR "CLCD: unable to remap registers\n");
ret = -ENOMEM; ret = -ENOMEM;
goto free_clk; goto clk_unprep;
} }
fb->fb.fbops = &clcdfb_ops; fb->fb.fbops = &clcdfb_ops;
@ -530,6 +534,8 @@ static int clcdfb_register(struct clcd_fb *fb)
fb_dealloc_cmap(&fb->fb.cmap); fb_dealloc_cmap(&fb->fb.cmap);
unmap: unmap:
iounmap(fb->regs); iounmap(fb->regs);
clk_unprep:
clk_unprepare(fb->clk);
free_clk: free_clk:
clk_put(fb->clk); clk_put(fb->clk);
out: out:
@ -595,6 +601,7 @@ static int clcdfb_remove(struct amba_device *dev)
if (fb->fb.cmap.len) if (fb->fb.cmap.len)
fb_dealloc_cmap(&fb->fb.cmap); fb_dealloc_cmap(&fb->fb.cmap);
iounmap(fb->regs); iounmap(fb->regs);
clk_unprepare(fb->clk);
clk_put(fb->clk); clk_put(fb->clk);
fb->board->remove(fb); fb->board->remove(fb);