aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-07 13:45:22 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-07 13:45:22 -0500
commit8995b161eb142b843094dd614b80e4cce1d66352 (patch)
treeffd9988879441d5ec45ab96b2e06f4fcb1210158 /drivers/video
parentcc918c7ab7da017bfaf9661420bb5c462e057cfb (diff)
parentfe5dd7c73d328b255286b6b65ca19dd34447f709 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/amba-clcd.c16
-rw-r--r--drivers/video/backlight/corgi_bl.c1
-rw-r--r--drivers/video/imxfb.c6
-rw-r--r--drivers/video/s3c2410fb.c5
4 files changed, 9 insertions, 19 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 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/ioport.h> 22#include <linux/ioport.h>
23#include <linux/list.h> 23#include <linux/list.h>
24#include <linux/amba/bus.h>
25#include <linux/amba/clcd.h>
26#include <linux/clk.h>
24 27
25#include <asm/sizes.h> 28#include <asm/sizes.h>
26#include <asm/hardware/amba.h>
27#include <asm/hardware/clock.h>
28
29#include <asm/hardware/amba_clcd.h>
30 29
31#define to_clcd(info) container_of(info, struct clcd_fb, fb) 30#define to_clcd(info) container_of(info, struct clcd_fb, fb)
32 31
@@ -346,10 +345,6 @@ static int clcdfb_register(struct clcd_fb *fb)
346 goto out; 345 goto out;
347 } 346 }
348 347
349 ret = clk_use(fb->clk);
350 if (ret)
351 goto free_clk;
352
353 fb->fb.fix.mmio_start = fb->dev->res.start; 348 fb->fb.fix.mmio_start = fb->dev->res.start;
354 fb->fb.fix.mmio_len = SZ_4K; 349 fb->fb.fix.mmio_len = SZ_4K;
355 350
@@ -357,7 +352,7 @@ static int clcdfb_register(struct clcd_fb *fb)
357 if (!fb->regs) { 352 if (!fb->regs) {
358 printk(KERN_ERR "CLCD: unable to remap registers\n"); 353 printk(KERN_ERR "CLCD: unable to remap registers\n");
359 ret = -ENOMEM; 354 ret = -ENOMEM;
360 goto unuse_clk; 355 goto free_clk;
361 } 356 }
362 357
363 fb->fb.fbops = &clcdfb_ops; 358 fb->fb.fbops = &clcdfb_ops;
@@ -427,8 +422,6 @@ static int clcdfb_register(struct clcd_fb *fb)
427 printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret); 422 printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret);
428 423
429 iounmap(fb->regs); 424 iounmap(fb->regs);
430 unuse_clk:
431 clk_unuse(fb->clk);
432 free_clk: 425 free_clk:
433 clk_put(fb->clk); 426 clk_put(fb->clk);
434 out: 427 out:
@@ -489,7 +482,6 @@ static int clcdfb_remove(struct amba_device *dev)
489 clcdfb_disable(fb); 482 clcdfb_disable(fb);
490 unregister_framebuffer(&fb->fb); 483 unregister_framebuffer(&fb->fb);
491 iounmap(fb->regs); 484 iounmap(fb->regs);
492 clk_unuse(fb->clk);
493 clk_put(fb->clk); 485 clk_put(fb->clk);
494 486
495 fb->board->remove(fb); 487 fb->board->remove(fb);
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 6a219b2c77e3..d0aaf450e8c7 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -20,6 +20,7 @@
20#include <linux/backlight.h> 20#include <linux/backlight.h>
21 21
22#include <asm/arch/sharpsl.h> 22#include <asm/arch/sharpsl.h>
23#include <asm/hardware/sharpsl_pm.h>
23 24
24#define CORGI_DEFAULT_INTENSITY 0x1f 25#define CORGI_DEFAULT_INTENSITY 0x1f
25#define CORGI_LIMIT_MASK 0x0b 26#define CORGI_LIMIT_MASK 0x0b
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 5924cc225c95..1718baaeed2a 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -554,7 +554,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
554 554
555 inf = pdev->dev.platform_data; 555 inf = pdev->dev.platform_data;
556 if(!inf) { 556 if(!inf) {
557 dev_err(dev,"No platform_data available\n"); 557 dev_err(&pdev->dev,"No platform_data available\n");
558 return -ENOMEM; 558 return -ENOMEM;
559 } 559 }
560 560
@@ -579,7 +579,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
579 if (!inf->fixed_screen_cpu) { 579 if (!inf->fixed_screen_cpu) {
580 ret = imxfb_map_video_memory(info); 580 ret = imxfb_map_video_memory(info);
581 if (ret) { 581 if (ret) {
582 dev_err(dev, "Failed to allocate video RAM: %d\n", ret); 582 dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);
583 ret = -ENOMEM; 583 ret = -ENOMEM;
584 goto failed_map; 584 goto failed_map;
585 } 585 }
@@ -608,7 +608,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
608 imxfb_set_par(info); 608 imxfb_set_par(info);
609 ret = register_framebuffer(info); 609 ret = register_framebuffer(info);
610 if (ret < 0) { 610 if (ret < 0) {
611 dev_err(dev, "failed to register framebuffer\n"); 611 dev_err(&pdev->dev, "failed to register framebuffer\n");
612 goto failed_register; 612 goto failed_register;
613 } 613 }
614 614
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ce6e749db3a7..fe99d17a21d7 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -87,6 +87,7 @@
87#include <linux/workqueue.h> 87#include <linux/workqueue.h>
88#include <linux/wait.h> 88#include <linux/wait.h>
89#include <linux/platform_device.h> 89#include <linux/platform_device.h>
90#include <linux/clk.h>
90 91
91#include <asm/io.h> 92#include <asm/io.h>
92#include <asm/uaccess.h> 93#include <asm/uaccess.h>
@@ -96,7 +97,6 @@
96#include <asm/arch/regs-lcd.h> 97#include <asm/arch/regs-lcd.h>
97#include <asm/arch/regs-gpio.h> 98#include <asm/arch/regs-gpio.h>
98#include <asm/arch/fb.h> 99#include <asm/arch/fb.h>
99#include <asm/hardware/clock.h>
100 100
101#ifdef CONFIG_PM 101#ifdef CONFIG_PM
102#include <linux/pm.h> 102#include <linux/pm.h>
@@ -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);
784release_clock: 783release_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);
788release_irq: 786release_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 }