diff options
author | Andrew Morton <akpm@osdl.org> | 2006-10-03 04:16:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:20 -0400 |
commit | 3879b6b6a8ee39b50559b2c2dd083c557d39e0f8 (patch) | |
tree | 680b2b4172b7c8c55589461e5812ad7828eb50f6 | |
parent | 20f43535694bb19e1bb45917b73b7e5cd5d74818 (diff) |
[PATCH] isdn: more pr_debug() fixes
drivers/isdn/sc/event.c: In function 'indicate_status':
drivers/isdn/sc/event.c:49: error: 'events' undeclared (first use in this function)
drivers/isdn/sc/event.c:49: error: (Each undeclared identifier is reported only once
drivers/isdn/sc/event.c:49: error: for each function it appears in.)
drivers/isdn/sc/event.c:49: warning: format '%d' expects type 'int', but argument 4 has type 'ulong'
drivers/isdn/sc/interrupt.c: In function 'interrupt_handler':
drivers/isdn/sc/interrupt.c:97: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'
drivers/isdn/sc/timer.c: In function 'check_reset':
drivers/isdn/sc/timer.c:80: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
Acked-by: Karsten Keil <kkeil@suse.de>
Cc: Zach Brown <zach.brown@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/isdn/sc/event.c | 2 | ||||
-rw-r--r-- | drivers/isdn/sc/interrupt.c | 2 | ||||
-rw-r--r-- | drivers/isdn/sc/timer.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/isdn/sc/event.c b/drivers/isdn/sc/event.c index 5b8c7c1a7663..57367325ef04 100644 --- a/drivers/isdn/sc/event.c +++ b/drivers/isdn/sc/event.c | |||
@@ -45,8 +45,10 @@ int indicate_status(int card, int event,ulong Channel,char *Data) | |||
45 | { | 45 | { |
46 | isdn_ctrl cmd; | 46 | isdn_ctrl cmd; |
47 | 47 | ||
48 | #ifdef DEBUG | ||
48 | pr_debug("%s: Indicating event %s on Channel %d\n", | 49 | pr_debug("%s: Indicating event %s on Channel %d\n", |
49 | sc_adapter[card]->devicename, events[event-256], Channel); | 50 | sc_adapter[card]->devicename, events[event-256], Channel); |
51 | #endif | ||
50 | if (Data != NULL){ | 52 | if (Data != NULL){ |
51 | pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename, | 53 | pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename, |
52 | Data); | 54 | Data); |
diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c index 8631d338d69a..ae6263125ac2 100644 --- a/drivers/isdn/sc/interrupt.c +++ b/drivers/isdn/sc/interrupt.c | |||
@@ -91,7 +91,7 @@ irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs | |||
91 | */ | 91 | */ |
92 | if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read)) | 92 | if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read)) |
93 | { | 93 | { |
94 | pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n", | 94 | pr_debug("%s: Received packet 0x%x bytes long at 0x%lx\n", |
95 | sc_adapter[card]->devicename, | 95 | sc_adapter[card]->devicename, |
96 | rcvmsg.msg_data.response.msg_len, | 96 | rcvmsg.msg_data.response.msg_len, |
97 | rcvmsg.msg_data.response.buff_offset); | 97 | rcvmsg.msg_data.response.buff_offset); |
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c index aced19aac5a2..f43282be0ada 100644 --- a/drivers/isdn/sc/timer.c +++ b/drivers/isdn/sc/timer.c | |||
@@ -76,7 +76,7 @@ void check_reset(unsigned long data) | |||
76 | if (sc_adapter[card]->StartOnReset) | 76 | if (sc_adapter[card]->StartOnReset) |
77 | startproc(card); | 77 | startproc(card); |
78 | } else { | 78 | } else { |
79 | pr_debug("%s: No signature yet, waiting another %d jiffies.\n", | 79 | pr_debug("%s: No signature yet, waiting another %lu jiffies.\n", |
80 | sc_adapter[card]->devicename, CHECKRESET_TIME); | 80 | sc_adapter[card]->devicename, CHECKRESET_TIME); |
81 | mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME); | 81 | mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME); |
82 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); | 82 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); |