projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
drivers
/
video
/
amba-clcd.c
diff --git
a/drivers/video/amba-clcd.c
b/drivers/video/amba-clcd.c
index
a3c2c45
..
b218717
100644
(file)
--- 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/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/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)
#define to_clcd(info) container_of(info, struct clcd_fb, fb)
@@
-308,7
+307,7
@@
static int clcdfb_blank(int blank_mode, struct fb_info *info)
return 0;
}
return 0;
}
-static int clcdfb_mmap(struct fb_info *info,
struct file *file,
+static int clcdfb_mmap(struct fb_info *info,
struct vm_area_struct *vma)
{
struct clcd_fb *fb = to_clcd(info);
struct vm_area_struct *vma)
{
struct clcd_fb *fb = to_clcd(info);
@@
-346,10
+345,6
@@
static int clcdfb_register(struct clcd_fb *fb)
goto out;
}
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;
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;
if (!fb->regs) {
printk(KERN_ERR "CLCD: unable to remap registers\n");
ret = -ENOMEM;
- goto
unus
e_clk;
+ goto
fre
e_clk;
}
fb->fb.fbops = &clcdfb_ops;
}
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);
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:
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);
clcdfb_disable(fb);
unregister_framebuffer(&fb->fb);
iounmap(fb->regs);
- clk_unuse(fb->clk);
clk_put(fb->clk);
fb->board->remove(fb);
clk_put(fb->clk);
fb->board->remove(fb);