Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146275
b: refs/heads/master
c: 257a6e8
h: refs/heads/master
i:
  146273: f884e93
  146271: 9161bea
v: v3
  • Loading branch information
Breno Leitao authored and Linus Torvalds committed Jun 11, 2009
1 parent 6b4c8c9 commit d63fe12
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 181bf1e815a2ad2a9a8b30ef6e92583d1530b255
refs/heads/master: 257a6e8cc7f9274f0af090494a3f1ee06548b5bd
16 changes: 6 additions & 10 deletions trunk/drivers/serial/icom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d63fe12

Please sign in to comment.