The patch titled
icom: fix compile errors when defining ICOM_TRACE
has been added to the -mm tree. Its filename is
icom-fix-compile-errors-when-defining-icom_trace.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: icom: fix compile errors when defining ICOM_TRACE
From: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxx>
Cc: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/icom.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff -puN drivers/serial/icom.c~icom-fix-compile-errors-when-defining-icom_trace drivers/serial/icom.c
--- a/drivers/serial/icom.c~icom-fix-compile-errors-when-defining-icom_trace
+++ a/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@xxxxxxxxxx>");
MODULE_DESCRIPTION("IBM iSeries Serial IOA driver");
MODULE_SUPPORTED_DEVICE
_
Patches currently in -mm which might be from leitao@xxxxxxxxxxxxxxxxxx are
linux-next.patch
icom-converting-space-to-tabs.patch
icom-fix-compile-errors-when-defining-icom_trace.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
