patch-2.3.14 linux/drivers/video/skeletonfb.c

• Lines: 53
• Date: Thu Aug 12 10:22:33 1999
• Orig file: v2.3.13/linux/drivers/video/skeletonfb.c
• Orig date: Mon Aug 9 14:59:23 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/video/skeletonfb.c linux/drivers/video/skeletonfb.c
@@ -73,6 +73,8 @@
 static int currcon = 0;
 static int inverse = 0;
 
+int xxxfb_init(void);
+int xxxfb_setup(char*);
 
 /* ------------------- chipset specific functions -------------------------- */
 
@@ -297,7 +299,7 @@
      *  Initialization
      */
 
-void __init xxxfb_init(void)
+int __init xxxfb_init(void)
 {
     fb_info.gen.fbhw = &xxx_switch;
     fb_info.gen.fbhw->detect();
@@ -316,12 +318,13 @@
     fbgen_set_disp(-1, &fb_info.gen);
     fbgen_install_cmap(0, &fb_info.gen);
     if (register_framebuffer(&fb_info.gen.info) < 0)
-	return;
-    printk("fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.gen.info.node),
+	return -EINVAL;
+    printk(KERN_INFO "fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.gen.info.node),
 	   fb_info.gen.info.modename);
 
     /* uncomment this if your driver cannot be unloaded */
     /* MOD_INC_USE_COUNT; */
+    return 0;
 }
 
 
@@ -345,7 +348,7 @@
      *  Setup
      */
 
-void __init xxxfb_setup(char *options, int *ints)
+int __init xxxfb_setup(char *options)
 {
     /* Parse user speficied options (`video=xxxfb:') */
 }
@@ -393,8 +396,7 @@
 #ifdef MODULE
 int init_module(void)
 {
-    xxxfb_init();
-    return 0;
+    return xxxfb_init();
 }
 
 void cleanup_module(void)