AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

V4L/DVB (5471): Cpia_pp.c: convert to module_{init,exit}

Browse Source 
After looking at a section bug (in the non-modular case, clearly 
non-init code referenced the __initdata parport_nr[]), I thought it was 
time to convert this driver to module_{init,exit}.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Adrian Bunk 2007-03-25 12:14:38 -03:00 committed by Mauro Carvalho Chehab
parent 585553eced
commit 9ab7e323af
1 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/media/video/cpia_pp.c
View File

@ -62,7 +62,6 @@ static int cpia_pp_close(void *privdata);
#define PPCPIA_PARPORT_OFF -2 #define PPCPIA_PARPORT_OFF -2
#define PPCPIA_PARPORT_NONE -1 #define PPCPIA_PARPORT_NONE -1
#ifdef MODULE
static int parport_nr[PARPORT_MAX] = {[0 ... PARPORT_MAX - 1] = PPCPIA_PARPORT_UNSPEC}; static int parport_nr[PARPORT_MAX] = {[0 ... PARPORT_MAX - 1] = PPCPIA_PARPORT_UNSPEC};
static char *parport[PARPORT_MAX] = {NULL,}; static char *parport[PARPORT_MAX] = {NULL,};
@ -72,11 +71,6 @@ MODULE_LICENSE("GPL");
module_param_array(parport, charp, NULL, 0); module_param_array(parport, charp, NULL, 0);
MODULE_PARM_DESC(parport, "'auto' or a list of parallel port numbers. Just like lp."); MODULE_PARM_DESC(parport, "'auto' or a list of parallel port numbers. Just like lp.");
#else
static int parport_nr[PARPORT_MAX] __initdata =
{[0 ... PARPORT_MAX - 1] = PPCPIA_PARPORT_UNSPEC};
static int parport_ptr = 0;
#endif
struct pp_cam_entry { struct pp_cam_entry {
struct pardevice *pdev; struct pardevice *pdev;
@ -819,7 +813,7 @@ static struct parport_driver cpia_pp_driver = {
.detach = cpia_pp_detach, .detach = cpia_pp_detach,
}; };
static int cpia_pp_init(void) static int __init cpia_pp_init(void)
{ {
printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT, printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,
CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER); CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER);
@ -838,8 +832,7 @@ static int cpia_pp_init(void)
return 0; return 0;
} }
#ifdef MODULE static int __init cpia_init(void)
int init_module(void)
{ {
if (parport[0]) { if (parport[0]) {
/* The user gave some parameters. Let's see what they were. */ /* The user gave some parameters. Let's see what they were. */
@ -866,38 +859,11 @@ int init_module(void)
return cpia_pp_init(); return cpia_pp_init();
} }
void cleanup_module(void) static void __exit cpia_cleanup(void)
{ {
parport_unregister_driver (&cpia_pp_driver); parport_unregister_driver(&cpia_pp_driver);
return; return;
} }
#else /* !MODULE */ module_init(cpia_init);
module_exit(cpia_cleanup);
static int __init cpia_pp_setup(char *str)
{
int err;
if (!strncmp(str, "parport", 7)) {
int n = simple_strtoul(str + 7, NULL, 10);
if (parport_ptr < PARPORT_MAX) {
parport_nr[parport_ptr++] = n;
} else {
LOG("too many ports, %s ignored.\n", str);
}
} else if (!strcmp(str, "auto")) {
parport_nr[0] = PPCPIA_PARPORT_AUTO;
} else if (!strcmp(str, "none")) {
parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE;
}
err=cpia_pp_init();
if (err)
return err;
return 1;
}
__setup("cpia_pp=", cpia_pp_setup);
#endif /* !MODULE */