[PATCH] mxser: remove ambiguous redefinition of INIT_WORK

Removes an unused and ambiguous redefinition of INIT_WORK()

Signed-off-by: Andreas Jaggi <andreas.jaggi@waterwave.ch>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/char/mxser.h b/drivers/char/mxser.h
index 7e188a4..9fe2849 100644 (file)
--- a/drivers/char/mxser.h
+++ b/drivers/char/mxser.h
@@ -439,12 +439,4 @@
 
 #define READ_MOXA_MUST_GDL(baseio)     inb((baseio)+MOXA_MUST_GDL_REGISTER)
 
-
-#ifndef INIT_WORK
-#define INIT_WORK(_work, _func, _data){        \
-       _data->tqueue.routine = _func;\
-       _data->tqueue.data = _data;\
-       }
-#endif
-
 #endif

diff --git a/drivers/char/mxser_new.h b/drivers/char/mxser_new.h
index a08f0ec..55b34a0 100644 (file)
--- a/drivers/char/mxser_new.h
+++ b/drivers/char/mxser_new.h
@@ -439,12 +439,4 @@
 
 #define READ_MOXA_MUST_GDL(baseio)     inb((baseio)+MOXA_MUST_GDL_REGISTER)
 
-
-#ifndef INIT_WORK
-#define INIT_WORK(_work, _func, _data){        \
-       _data->tqueue.routine = _func;\
-       _data->tqueue.data = _data;\
-       }
-#endif
-
 #endif