Commit 577eabb2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Bartlomiej Zolnierkiewicz
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent e4bedbb6

drivers/video/fbdev/atafb.c

+1 −15
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#define ATAFB_EXT

#define ATAFB_FALCON



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/string.h>
@@ -3078,14 +3077,11 @@ int __init atafb_init(void) 
	int pad, detected_mode, error;

	unsigned int defmode = 0;

	unsigned long mem_req;



#ifndef MODULE

	char *option = NULL;



	if (fb_get_options("atafb", &option))

		return -ENODEV;

	atafb_setup(option);

#endif

	printk("atafb_init: start\n");



	if (!MACH_IS_ATARI)
@@ -3251,14 +3247,4 @@ int __init atafb_init(void) 
	return 0;

}



module_init(atafb_init);



#ifdef MODULE

MODULE_LICENSE("GPL");



int cleanup_module(void)

{

	unregister_framebuffer(&fb_info);

	return atafb_deinit();

}

#endif /* MODULE */
 
device_initcall(atafb_init);

drivers/video/fbdev/atafb_iplan2p2.c

+0 −23
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *  more details.

 */



#include <linux/module.h>

#include <linux/string.h>

#include <linux/fb.h>
@@ -269,25 +268,3 @@ void atafb_iplan2p2_linefill(struct fb_info *info, u_long next_line, 
	if (width)

		fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);

}
 


#ifdef MODULE

MODULE_LICENSE("GPL");



int init_module(void)

{

	return 0;

}



void cleanup_module(void)

{

}

#endif /* MODULE */





    /*

     *  Visible symbols for modules

     */



EXPORT_SYMBOL(atafb_iplan2p2_copyarea);

EXPORT_SYMBOL(atafb_iplan2p2_fillrect);

EXPORT_SYMBOL(atafb_iplan2p2_linefill);

drivers/video/fbdev/atafb_iplan2p4.c

+0 −23
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *  more details.

 */



#include <linux/module.h>

#include <linux/string.h>

#include <linux/fb.h>
@@ -284,25 +283,3 @@ void atafb_iplan2p4_linefill(struct fb_info *info, u_long next_line, 
	if (width)

		fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);

}
 


#ifdef MODULE

MODULE_LICENSE("GPL");



int init_module(void)

{

	return 0;

}



void cleanup_module(void)

{

}

#endif /* MODULE */





    /*

     *  Visible symbols for modules

     */



EXPORT_SYMBOL(atafb_iplan2p4_copyarea);

EXPORT_SYMBOL(atafb_iplan2p4_fillrect);

EXPORT_SYMBOL(atafb_iplan2p4_linefill);

drivers/video/fbdev/atafb_iplan2p8.c

+0 −23
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *  more details.

 */



#include <linux/module.h>

#include <linux/string.h>

#include <linux/fb.h>
@@ -321,25 +320,3 @@ void atafb_iplan2p8_linefill(struct fb_info *info, u_long next_line, 
	if (width)

		fill8_2col((u8 *)dest, fgcolor, bgcolor, *data);

}
 


#ifdef MODULE

MODULE_LICENSE("GPL");



int init_module(void)

{

	return 0;

}



void cleanup_module(void)

{

}

#endif /* MODULE */





    /*

     *  Visible symbols for modules

     */



EXPORT_SYMBOL(atafb_iplan2p8_copyarea);

EXPORT_SYMBOL(atafb_iplan2p8_fillrect);

EXPORT_SYMBOL(atafb_iplan2p8_linefill);

drivers/video/fbdev/atafb_mfb.c

+0 −23
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 *  more details.

 */



#include <linux/module.h>

#include <linux/string.h>

#include <linux/fb.h>
@@ -88,25 +87,3 @@ void atafb_mfb_linefill(struct fb_info *info, u_long next_line, 
		*dest++ = *data++;

	}

}
 


#ifdef MODULE

MODULE_LICENSE("GPL");



int init_module(void)

{

	return 0;

}



void cleanup_module(void)

{

}

#endif /* MODULE */





    /*

     *  Visible symbols for modules

     */



EXPORT_SYMBOL(atafb_mfb_copyarea);

EXPORT_SYMBOL(atafb_mfb_fillrect);

EXPORT_SYMBOL(atafb_mfb_linefill);

CRA Git | Maintained and supported by SUSTech CRA and CCSE