diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/applicom.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index a370e7a0bad5..9275d5e52e6d 100644 --- a/drivers/char/applicom.c +++ b/drivers/char/applicom.c | |||
@@ -166,11 +166,7 @@ static int ac_register_board(unsigned long physloc, void __iomem *loc, | |||
166 | return boardno + 1; | 166 | return boardno + 1; |
167 | } | 167 | } |
168 | 168 | ||
169 | #ifdef MODULE | 169 | static void __exit applicom_exit(void) |
170 | |||
171 | #define applicom_init init_module | ||
172 | |||
173 | void cleanup_module(void) | ||
174 | { | 170 | { |
175 | unsigned int i; | 171 | unsigned int i; |
176 | 172 | ||
@@ -188,9 +184,7 @@ void cleanup_module(void) | |||
188 | } | 184 | } |
189 | } | 185 | } |
190 | 186 | ||
191 | #endif /* MODULE */ | 187 | static int __init applicom_init(void) |
192 | |||
193 | int __init applicom_init(void) | ||
194 | { | 188 | { |
195 | int i, numisa = 0; | 189 | int i, numisa = 0; |
196 | struct pci_dev *dev = NULL; | 190 | struct pci_dev *dev = NULL; |
@@ -355,10 +349,9 @@ out: | |||
355 | return ret; | 349 | return ret; |
356 | } | 350 | } |
357 | 351 | ||
352 | module_init(applicom_init); | ||
353 | module_exit(applicom_exit); | ||
358 | 354 | ||
359 | #ifndef MODULE | ||
360 | __initcall(applicom_init); | ||
361 | #endif | ||
362 | 355 | ||
363 | static ssize_t ac_write(struct file *file, const char __user *buf, size_t count, loff_t * ppos) | 356 | static ssize_t ac_write(struct file *file, const char __user *buf, size_t count, loff_t * ppos) |
364 | { | 357 | { |
@@ -851,28 +844,3 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un | |||
851 | return 0; | 844 | return 0; |
852 | } | 845 | } |
853 | 846 | ||
854 | #ifndef MODULE | ||
855 | static int __init applicom_setup(char *str) | ||
856 | { | ||
857 | int ints[4]; | ||
858 | |||
859 | (void) get_options(str, 4, ints); | ||
860 | |||
861 | if (ints[0] > 2) { | ||
862 | printk(KERN_WARNING "Too many arguments to 'applicom=', expected mem,irq only.\n"); | ||
863 | } | ||
864 | |||
865 | if (ints[0] < 2) { | ||
866 | printk(KERN_INFO"applicom numargs: %d\n", ints[0]); | ||
867 | return 0; | ||
868 | } | ||
869 | |||
870 | mem = ints[1]; | ||
871 | irq = ints[2]; | ||
872 | return 1; | ||
873 | } | ||
874 | |||
875 | __setup("applicom=", applicom_setup); | ||
876 | |||
877 | #endif /* MODULE */ | ||
878 | |||