From: Andreas Jaggi Removes an unused and ambiguous redefinition of INIT_WORK() Signed-off-by: Andreas Jaggi Acked-by: Jiri Slaby Signed-off-by: Andrew Morton --- drivers/char/mxser.h | 8 -------- drivers/char/mxser_new.h | 8 -------- 2 files changed, 16 deletions(-) diff -puN drivers/char/mxser.h~mxser-remove-ambiguous-redefinition-of-init_work drivers/char/mxser.h --- a/drivers/char/mxser.h~mxser-remove-ambiguous-redefinition-of-init_work +++ a/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 -puN drivers/char/mxser_new.h~mxser-remove-ambiguous-redefinition-of-init_work drivers/char/mxser_new.h --- a/drivers/char/mxser_new.h~mxser-remove-ambiguous-redefinition-of-init_work +++ a/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 _