icom: fix compile errors when defining ICOM_TRACE
PATCH 1/1 icom: fix compile errors when defining ICOM_TRACE
As it is, defining ICOM_TRACE produces some compile errors, as "parameter name omitted" and "redefinition of ‘trace’"
This patch removes the wrong trace definition.
Signed-off-by Breno Leitao <[email protected]>
--- drivers/serial/icom.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)
drivers/serial/icom.c +6 -10
@@ -137,7 +137,12 @@ static LIST_HEAD(icom_adapter_head);static spinlock_t icom_lock;#ifdef ICOM_TRACE -static inline void trace (struct icom_port *,char *,unsigned long ) {}; +static inline void trace (struct icom_port *icom_port,char *trace_pt, +unsigned long trace_data) +{ +dev_info (&icom_port->adapter->pci_dev->dev,":%d:%s - %lx\n" , + icom_port->port, trace_pt, trace_data); +}#else static inline void trace (struct icom_port *icom_port,char *trace_pt,unsigned long trace_data) {};#endif
@@ -1647,15 +1652,6 @@ static void __exit icom_exit(void)module_init (icom_init);module_exit (icom_exit); -#ifdef ICOM_TRACE -static inline void trace (struct icom_port *icom_port,char *trace_pt, -unsigned long trace_data) -{ -dev_info (&icom_port->adapter->pci_dev->dev,":%d:%s - %lx\n" , - icom_port->port, trace_pt, trace_data); -} -#endif -MODULE_AUTHOR ("Michael Anderson <[email protected]>" );MODULE_DESCRIPTION ("IBM iSeries Serial IOA driver" );MODULE_SUPPORTED_DEVICE
Signature · 1 line
1.6.0.2