Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: atafb: Remove obsolete module support

CONFIG_FB_ATARI is bool, hence the Atari frame buffer driver cannot be
built as a module. In addition, the module support code refers to a
function atafb_deinit(), which never existed.

Replace module_init() by device_initcall().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

authored by

Geert Uytterhoeven and committed by
Bartlomiej Zolnierkiewicz
577eabb2 e4bedbb6

+1 -107
+1 -15
drivers/video/fbdev/atafb.c
··· 47 47 #define ATAFB_EXT 48 48 #define ATAFB_FALCON 49 49 50 - #include <linux/module.h> 51 50 #include <linux/kernel.h> 52 51 #include <linux/errno.h> 53 52 #include <linux/string.h> ··· 3077 3078 int pad, detected_mode, error; 3078 3079 unsigned int defmode = 0; 3079 3080 unsigned long mem_req; 3080 - 3081 - #ifndef MODULE 3082 3081 char *option = NULL; 3083 3082 3084 3083 if (fb_get_options("atafb", &option)) 3085 3084 return -ENODEV; 3086 3085 atafb_setup(option); 3087 - #endif 3088 3086 printk("atafb_init: start\n"); 3089 3087 3090 3088 if (!MACH_IS_ATARI) ··· 3247 3251 return 0; 3248 3252 } 3249 3253 3250 - module_init(atafb_init); 3251 - 3252 - #ifdef MODULE 3253 - MODULE_LICENSE("GPL"); 3254 - 3255 - int cleanup_module(void) 3256 - { 3257 - unregister_framebuffer(&fb_info); 3258 - return atafb_deinit(); 3259 - } 3260 - #endif /* MODULE */ 3254 + device_initcall(atafb_init);
-23
drivers/video/fbdev/atafb_iplan2p2.c
··· 10 10 * more details. 11 11 */ 12 12 13 - #include <linux/module.h> 14 13 #include <linux/string.h> 15 14 #include <linux/fb.h> 16 15 ··· 268 269 if (width) 269 270 fill8_2col((u8 *)dest, fgcolor, bgcolor, *data); 270 271 } 271 - 272 - #ifdef MODULE 273 - MODULE_LICENSE("GPL"); 274 - 275 - int init_module(void) 276 - { 277 - return 0; 278 - } 279 - 280 - void cleanup_module(void) 281 - { 282 - } 283 - #endif /* MODULE */ 284 - 285 - 286 - /* 287 - * Visible symbols for modules 288 - */ 289 - 290 - EXPORT_SYMBOL(atafb_iplan2p2_copyarea); 291 - EXPORT_SYMBOL(atafb_iplan2p2_fillrect); 292 - EXPORT_SYMBOL(atafb_iplan2p2_linefill);
-23
drivers/video/fbdev/atafb_iplan2p4.c
··· 10 10 * more details. 11 11 */ 12 12 13 - #include <linux/module.h> 14 13 #include <linux/string.h> 15 14 #include <linux/fb.h> 16 15 ··· 283 284 if (width) 284 285 fill8_2col((u8 *)dest, fgcolor, bgcolor, *data); 285 286 } 286 - 287 - #ifdef MODULE 288 - MODULE_LICENSE("GPL"); 289 - 290 - int init_module(void) 291 - { 292 - return 0; 293 - } 294 - 295 - void cleanup_module(void) 296 - { 297 - } 298 - #endif /* MODULE */ 299 - 300 - 301 - /* 302 - * Visible symbols for modules 303 - */ 304 - 305 - EXPORT_SYMBOL(atafb_iplan2p4_copyarea); 306 - EXPORT_SYMBOL(atafb_iplan2p4_fillrect); 307 - EXPORT_SYMBOL(atafb_iplan2p4_linefill);
-23
drivers/video/fbdev/atafb_iplan2p8.c
··· 10 10 * more details. 11 11 */ 12 12 13 - #include <linux/module.h> 14 13 #include <linux/string.h> 15 14 #include <linux/fb.h> 16 15 ··· 320 321 if (width) 321 322 fill8_2col((u8 *)dest, fgcolor, bgcolor, *data); 322 323 } 323 - 324 - #ifdef MODULE 325 - MODULE_LICENSE("GPL"); 326 - 327 - int init_module(void) 328 - { 329 - return 0; 330 - } 331 - 332 - void cleanup_module(void) 333 - { 334 - } 335 - #endif /* MODULE */ 336 - 337 - 338 - /* 339 - * Visible symbols for modules 340 - */ 341 - 342 - EXPORT_SYMBOL(atafb_iplan2p8_copyarea); 343 - EXPORT_SYMBOL(atafb_iplan2p8_fillrect); 344 - EXPORT_SYMBOL(atafb_iplan2p8_linefill);
-23
drivers/video/fbdev/atafb_mfb.c
··· 9 9 * more details. 10 10 */ 11 11 12 - #include <linux/module.h> 13 12 #include <linux/string.h> 14 13 #include <linux/fb.h> 15 14 ··· 87 88 *dest++ = *data++; 88 89 } 89 90 } 90 - 91 - #ifdef MODULE 92 - MODULE_LICENSE("GPL"); 93 - 94 - int init_module(void) 95 - { 96 - return 0; 97 - } 98 - 99 - void cleanup_module(void) 100 - { 101 - } 102 - #endif /* MODULE */ 103 - 104 - 105 - /* 106 - * Visible symbols for modules 107 - */ 108 - 109 - EXPORT_SYMBOL(atafb_mfb_copyarea); 110 - EXPORT_SYMBOL(atafb_mfb_fillrect); 111 - EXPORT_SYMBOL(atafb_mfb_linefill);