drivers/char/applicom.c: proper module_{init,exit}
PATCH 1/1 drivers/char/applicom.c: proper module_{init,exit}
This patch converts the driver to use module_{init,exit}.
Signed-off-by Adrian Bunk <[email protected]>
Acked-by David Woodhouse <[email protected]>
---
drivers/char/applicom.c | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-)
drivers/char/applicom.c renamed from drivers/char/applicom.c.old +4 -36
@@ -166,11 +166,7 @@return boardno +1 ; } -#ifdef MODULE - -#define applicom_init init_module - -void cleanup_module (void ) +static void __exit applicom_exit(void) {unsigned int i;
@@ -188,9 +184,7 @@ } } -#endif /* MODULE */ - -int __init applicom_init (void ) +static int __init applicom_init (void ) {int i, numisa =0 ;struct pci_dev *dev =NULL ;
@@ -358,10 +352,9 @@return ret; } +module_init (applicom_init); +module_exit (applicom_exit); -#ifndef MODULE -__initcall (applicom_init); -#endif static ssize_t ac_write (struct file *file,const char __user *buf,size_t count,loff_t * ppos) {
@@ -854,28 +847,3 @@return 0 ; } -#ifndef MODULE -static int __init applicom_setup (char *str) -{ -int ints[4 ]; - - (void )get_options (str,4 , ints); - -if (ints[0 ] >2 ) { -printk (KERN_WARNING "Too many arguments to 'applicom=', expected mem,irq only.\n" ); - } - -if (ints[0 ] <2 ) { -printk (KERN_INFO "applicom numargs: %d\n" , ints[0 ]); -return 0 ; - } - - mem = ints[1 ]; - irq = ints[2 ]; -return 1 ; -} - -__setup ("applicom=" , applicom_setup); - -#endif /* MODULE */ -