[PATCH] remove many unneeded #includes of sched.h

[safe/jmp/linux-2.6] / drivers / video / imxfb.c

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1d54d3d..267c1ff 100644 (file)
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -18,10 +18,8 @@
 
 //#define DEBUG 1
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/interrupt.h>
@@ -31,7 +29,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/hardware.h>
@@ -298,7 +296,6 @@ static struct fb_ops imxfb_ops = {
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
        .fb_blank       = imxfb_blank,
-       .fb_cursor      = soft_cursor, /* FIXME: i.MX can do hardware cursor */
 };
 
 /*
@@ -424,23 +421,21 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int imxfb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-       struct imxfb_info *fbi = dev_get_drvdata(dev);
+       struct imxfb_info *fbi = platform_get_drvdata(dev);
        pr_debug("%s\n",__FUNCTION__);
 
-       if (level == SUSPEND_DISABLE || level == SUSPEND_POWER_DOWN)
-               imxfb_disable_controller(fbi);
+       imxfb_disable_controller(fbi);
        return 0;
 }
 
-static int imxfb_resume(struct device *dev, u32 level)
+static int imxfb_resume(struct platform_device *dev)
 {
-       struct imxfb_info *fbi = dev_get_drvdata(dev);
+       struct imxfb_info *fbi = platform_get_drvdata(dev);
        pr_debug("%s\n",__FUNCTION__);
 
-       if (level == RESUME_ENABLE)
-               imxfb_enable_controller(fbi);
+       imxfb_enable_controller(fbi);
        return 0;
 }
 #else
@@ -541,9 +536,8 @@ static int __init imxfb_map_video_memory(struct fb_info *info)
        return fbi->map_cpu ? 0 : -ENOMEM;
 }
 
-static int __init imxfb_probe(struct device *dev)
+static int __init imxfb_probe(struct platform_device *pdev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
        struct imxfb_info *fbi;
        struct fb_info *info;
        struct imxfb_mach_info *inf;
@@ -556,21 +550,21 @@ static int __init imxfb_probe(struct device *dev)
        if(!res)
                return -ENODEV;
 
-       inf = dev->platform_data;
+       inf = pdev->dev.platform_data;
        if(!inf) {
-               dev_err(dev,"No platform_data available\n");
+               dev_err(&pdev->dev,"No platform_data available\n");
                return -ENOMEM;
        }
 
-       info = framebuffer_alloc(sizeof(struct imxfb_info), dev);
+       info = framebuffer_alloc(sizeof(struct imxfb_info), &pdev->dev);
        if(!info)
                return -ENOMEM;
 
        fbi = info->par;
 
-       dev_set_drvdata(dev, info);
+       platform_set_drvdata(pdev, info);
 
-       ret = imxfb_init_fbinfo(dev);
+       ret = imxfb_init_fbinfo(&pdev->dev);
        if( ret < 0 )
                goto failed_init;
 
@@ -583,7 +577,7 @@ static int __init imxfb_probe(struct device *dev)
        if (!inf->fixed_screen_cpu) {
                ret = imxfb_map_video_memory(info);
                if (ret) {
-                       dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+                       dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);
                        ret = -ENOMEM;
                        goto failed_map;
                }
@@ -612,7 +606,7 @@ static int __init imxfb_probe(struct device *dev)
        imxfb_set_par(info);
        ret = register_framebuffer(info);
        if (ret < 0) {
-               dev_err(dev, "failed to register framebuffer\n");
+               dev_err(&pdev->dev, "failed to register framebuffer\n");
                goto failed_register;
        }
 
@@ -624,22 +618,21 @@ failed_register:
        fb_dealloc_cmap(&info->cmap);
 failed_cmap:
        if (!inf->fixed_screen_cpu)
-               dma_free_writecombine(dev,fbi->map_size,fbi->map_cpu,
+               dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,
                           fbi->map_dma);
 failed_map:
        kfree(info->pseudo_palette);
 failed_regs:
        release_mem_region(res->start, res->end - res->start);
 failed_init:
-       dev_set_drvdata(dev, NULL);
+       platform_set_drvdata(pdev, NULL);
        framebuffer_release(info);
        return ret;
 }
 
-static int imxfb_remove(struct device *dev)
+static int imxfb_remove(struct platform_device *pdev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct fb_info *info = dev_get_drvdata(dev);
+       struct fb_info *info = platform_get_drvdata(pdev);
        struct imxfb_info *fbi = info->par;
        struct resource *res;
 
@@ -654,36 +647,37 @@ static int imxfb_remove(struct device *dev)
        framebuffer_release(info);
 
        release_mem_region(res->start, res->end - res->start + 1);
-       dev_set_drvdata(dev, NULL);
+       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }
 
-void  imxfb_shutdown(struct device * dev)
+void  imxfb_shutdown(struct platform_device * dev)
 {
-       struct fb_info *info = dev_get_drvdata(dev);
+       struct fb_info *info = platform_get_drvdata(dev);
        struct imxfb_info *fbi = info->par;
        imxfb_disable_controller(fbi);
 }
 
-static struct device_driver imxfb_driver = {
-       .name           = "imx-fb",
-       .bus            = &platform_bus_type,
+static struct platform_driver imxfb_driver = {
        .probe          = imxfb_probe,
        .suspend        = imxfb_suspend,
        .resume         = imxfb_resume,
        .remove         = imxfb_remove,
        .shutdown       = imxfb_shutdown,
+       .driver         = {
+               .name   = "imx-fb",
+       },
 };
 
 int __init imxfb_init(void)
 {
-       return driver_register(&imxfb_driver);
+       return platform_driver_register(&imxfb_driver);
 }
 
 static void __exit imxfb_cleanup(void)
 {
-       driver_unregister(&imxfb_driver);
+       platform_driver_unregister(&imxfb_driver);
 }
 
 module_init(imxfb_init);