diff options
| author | Breno Leitao <leitao@linux.vnet.ibm.com> | 2009-06-11 13:20:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 08:51:03 -0700 |
| commit | 257a6e8cc7f9274f0af090494a3f1ee06548b5bd (patch) | |
| tree | ac06962eba607b90398a37438fa8aa16f1a7f9f4 /drivers | |
| parent | 181bf1e815a2ad2a9a8b30ef6e92583d1530b255 (diff) | |
| download | linux-3.10-257a6e8cc7f9274f0af090494a3f1ee06548b5bd.tar.gz linux-3.10-257a6e8cc7f9274f0af090494a3f1ee06548b5bd.tar.bz2 linux-3.10-257a6e8cc7f9274f0af090494a3f1ee06548b5bd.zip | |
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 <leitao@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/icom.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index fd5fd23804b..9f2891c2c4a 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c @@ -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 <mjanders@us.ibm.com>"); MODULE_DESCRIPTION("IBM iSeries Serial IOA driver"); MODULE_SUPPORTED_DEVICE |