Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 45bbd37..0b8d5b1 100644 (file)
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -81,7 +81,6 @@
 #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/zorro.h>
@@ -110,8 +109,6 @@ static void cv64_dump(void);
 #define wb_64(regs,reg,dat) (*(((volatile unsigned char *)regs) + reg) = dat)
 #define rb_64(regs, reg) (*(((volatile unsigned char *)regs) + reg))
 
-#define ww_64(regs,reg,dat) (*((volatile unsigned short *)(regs + reg) = dat)
-
 struct cyberfb_par {
        struct fb_var_screeninfo var;
        __u32 type;
@@ -1056,6 +1053,8 @@ int __init cyberfb_init(void)
 
            if (register_framebuffer(&fb_info) < 0) {
                    DPRINTK("EXIT - register_framebuffer failed\n");
+                       if (CyberBase)
+                               iounmap(CyberBase);
                    release_mem_region(CyberMem_phys, 0x400000);
                    release_mem_region(CyberRegs_phys, 0x10000);
                    return -EINVAL;
@@ -1065,7 +1064,6 @@ int __init cyberfb_init(void)
                   fb_info.node, fb_info.modename, CyberSize>>10);
 
            /* TODO: This driver cannot be unloaded yet */
-           MOD_INC_USE_COUNT;
            DPRINTK("EXIT\n");
            return 0;
        }
@@ -1206,14 +1204,6 @@ int init_module(void)
 {
        return cyberfb_init();
 }
-
-void cleanup_module(void)
-{
-       /* Not reached because the usecount will never be
-          decremented to zero */
-       unregister_framebuffer(&fb_info);
-       /* TODO: clean up ... */
-}
 #endif /* MODULE */
 
 /*