Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257a6e8c authored by Breno Leitao's avatar Breno Leitao Committed by Linus Torvalds
Browse files

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: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 181bf1e8

drivers/serial/icom.c

+6 −10
Original line number Diff line number Diff line
@@ -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