Commit c34aca4f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] pcxx.c build fix

  CC      drivers/char/pcxx.o
drivers/char/pcxx.c: In function `pcxe_cleanup':
drivers/char/pcxx.c:209: warning: unused variable `e2'
drivers/char/pcxx.c: At top level:
drivers/char/pcxx.c:229: `pcxe_init' undeclared here (not in a function)
drivers/char/pcxx.c:230: warning: type defaults to `int' in declaration of `module_cleanup'
drivers/char/pcxx.c:230: warning: parameter names (without types) in function declaration
drivers/char/pcxx.c:230: warning: data definition has no type or storage class
drivers/char/pcxx.c:1016: redefinition of `__initcall_pcxe_init'
drivers/char/pcxx.c:229: `__initcall_pcxe_init' previously defined here
drivers/char/pcxx.c:1016: `pcxe_init' undeclared here (not in a function)
drivers/char/pcxx.c:1017: `pcxe_exit' undeclared here (not in a function)
drivers/char/pcxx.c: In function `pcxe_tiocmget':
drivers/char/pcxx.c:2009: `mstat' undeclared (first use in this function)
drivers/char/pcxx.c:2009: (Each undeclared identifier is reported only once
drivers/char/pcxx.c:2009: for each function it appears in.)
drivers/char/pcxx.c: In function `pcxe_tiocmset':
drivers/char/pcxx.c:2072: warning: control reaches end of non-void function
drivers/char/pcxx.c: At top level:
drivers/char/pcxx.c:1044: warning: `pcxe_init' defined but not used
Signed-off-by: default avatarAdrian Bunk <bunk@fs.tum.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bd38c30a
...@@ -206,7 +206,7 @@ static void __exit pcxe_cleanup(void) ...@@ -206,7 +206,7 @@ static void __exit pcxe_cleanup(void)
{ {
unsigned long flags; unsigned long flags;
int e1, e2; int e1;
printk(KERN_NOTICE "Unloading PC/Xx version %s\n", VERSION); printk(KERN_NOTICE "Unloading PC/Xx version %s\n", VERSION);
...@@ -223,12 +223,6 @@ static void __exit pcxe_cleanup(void) ...@@ -223,12 +223,6 @@ static void __exit pcxe_cleanup(void)
restore_flags(flags); restore_flags(flags);
} }
/*
* pcxe_init() is our init_module():
*/
module_init(pcxe_init);
module_cleanup(pcxe_cleanup);
static inline struct channel *chan(register struct tty_struct *tty) static inline struct channel *chan(register struct tty_struct *tty)
{ {
if (tty) { if (tty) {
...@@ -1013,9 +1007,6 @@ void __init pcxx_setup(char *str, int *ints) ...@@ -1013,9 +1007,6 @@ void __init pcxx_setup(char *str, int *ints)
} }
#endif #endif
module_init(pcxe_init)
module_exit(pcxe_exit)
static struct tty_operations pcxe_ops = { static struct tty_operations pcxe_ops = {
.open = pcxe_open, .open = pcxe_open,
.close = pcxe_close, .close = pcxe_close,
...@@ -1561,6 +1552,8 @@ static int __init pcxe_init(void) ...@@ -1561,6 +1552,8 @@ static int __init pcxe_init(void)
return ret; return ret;
} }
module_init(pcxe_init)
module_exit(pcxe_cleanup)
static void pcxxpoll(unsigned long dummy) static void pcxxpoll(unsigned long dummy)
{ {
...@@ -1995,6 +1988,7 @@ static int pcxe_tiocmget(struct tty_struct *tty, struct file *file) ...@@ -1995,6 +1988,7 @@ static int pcxe_tiocmget(struct tty_struct *tty, struct file *file)
volatile struct board_chan *bc; volatile struct board_chan *bc;
unsigned long flags; unsigned long flags;
int mflag = 0; int mflag = 0;
int mstat;
if(ch) if(ch)
bc = ch->brdchan; bc = ch->brdchan;
...@@ -2069,6 +2063,7 @@ static int pcxe_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -2069,6 +2063,7 @@ static int pcxe_tiocmset(struct tty_struct *tty, struct file *file,
pcxxparam(tty,ch); pcxxparam(tty,ch);
memoff(ch); memoff(ch);
restore_flags(flags); restore_flags(flags);
return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment