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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/video/fm2fb.c linux/drivers/video/fm2fb.c
@@ -205,7 +205,7 @@
      *  Interface to the low level console driver
      */
 
-void fm2fb_init(void);
+int fm2fb_init(void);
 static int fm2fbcon_switch(int con, struct fb_info *info);
 static int fm2fbcon_updatevar(int con, struct fb_info *info);
 static void fm2fbcon_blank(int blank, struct fb_info *info);
@@ -374,7 +374,7 @@
      *  Initialisation
      */
 
-void __init fm2fb_init(void)
+int __init fm2fb_init(void)
 {
     int key, is_fm;
     const struct ConfigDev *cd  = NULL;
@@ -383,10 +383,10 @@
 
     if (!(key = is_fm = zorro_find(ZORRO_PROD_BSC_FRAMEMASTER_II, 0, 0)) &&
 	!(key = zorro_find(ZORRO_PROD_HELFRICH_RAINBOW_II, 0, 0)))
-	return;
+	return -ENXIO;
     cd = zorro_get_board(key);
     if (!(board = (u_long)cd->cd_BoardAddr))
-	return;
+	return -ENXIO;
     zorro_config_board(key, 0);
 
     /* assigning memory to kernel space */
@@ -460,18 +460,19 @@
     fm2fb_set_var(&fb_var, -1, &fb_info);
 
     if (register_framebuffer(&fb_info) < 0)
-	return;
+	return -EINVAL;
 
     printk("fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.node),
 	   fb_fix.id);
+    return 0;
 }
 
-void __init fm2fb_setup(char *options, int *ints)
+int __init fm2fb_setup(char *options)
 {
     char *this_opt;
 
     if (!options || !*options)
-	return;
+	return 0;
 
     for (this_opt = strtok(options, ","); this_opt;
 	 this_opt = strtok(NULL, ",")) {
@@ -480,6 +481,7 @@
 	else if (!strncmp(this_opt, "ntsc", 4))
 	    fm2fb_mode = FM2FB_MODE_NTSC;
     }
+    return 0;
 }