linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / epson1355fb.c

diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 737257d..3b0e713 100644 (file)
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -48,6 +48,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -604,6 +605,10 @@ static void clearfb16(struct fb_info *info)
                fb_writeb(0, dst);
 }
 
+static void epson1355fb_platform_release(struct device *device)
+{
+}
+
 static int epson1355fb_remove(struct platform_device *dev)
 {
        struct fb_info *info = platform_get_drvdata(dev);
@@ -727,7 +732,13 @@ static struct platform_driver epson1355fb_driver = {
        },
 };
 
-static struct platform_device *epson1355fb_device;
+static struct platform_device epson1355fb_device = {
+       .name   = "epson1355fb",
+       .id     = 0,
+       .dev    = {
+               .release = epson1355fb_platform_release,
+       }
+};
 
 int __init epson1355fb_init(void)
 {
@@ -737,21 +748,11 @@ int __init epson1355fb_init(void)
                return -ENODEV;
 
        ret = platform_driver_register(&epson1355fb_driver);
-
        if (!ret) {
-               epson1355fb_device = platform_device_alloc("epson1355fb", 0);
-
-               if (epson1355fb_device)
-                       ret = platform_device_add(epson1355fb_device);
-               else
-                       ret = -ENOMEM;
-
-               if (ret) {
-                       platform_device_put(epson1355fb_device);
+               ret = platform_device_register(&epson1355fb_device);
+               if (ret)
                        platform_driver_unregister(&epson1355fb_driver);
-               }
        }
-
        return ret;
 }
 
@@ -760,7 +761,7 @@ module_init(epson1355fb_init);
 #ifdef MODULE
 static void __exit epson1355fb_exit(void)
 {
-       platform_device_unregister(epson1355fb_device);
+       platform_device_unregister(&epson1355fb_device);
        platform_driver_unregister(&epson1355fb_driver);
 }