[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>

diff --git a/drivers/isdn/sc/event.c b/drivers/isdn/sc/event.c
index 5b8c7c1a7663ffdc5418e8194a9a44430dd76279..57367325ef04513f9ef4fa30c81244c58cc41df6 100644 (file)
--- 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)
 {
        isdn_ctrl cmd;
 
+#ifdef DEBUG
        pr_debug("%s: Indicating event %s on Channel %d\n",
                sc_adapter[card]->devicename, events[event-256], Channel);
+#endif
        if (Data != NULL){
                pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename,
                        Data);

diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
index 8631d338d69ab550084ad4e3d0eaaebacd206b6c..ae6263125ac2ef04dbcf8c4ff04c9af340a80ab9 100644 (file)
--- 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
                 */
                if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read))
                {
-                       pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n",
+                       pr_debug("%s: Received packet 0x%x bytes long at 0x%lx\n",
                                                sc_adapter[card]->devicename,
                                                rcvmsg.msg_data.response.msg_len,
                                                rcvmsg.msg_data.response.buff_offset);

diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index aced19aac5a2e5011d81cb4f03ef6805836e5d62..f43282be0adafd0e1b474ccea84cccb24ba9bc7f 100644 (file)
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -76,7 +76,7 @@ void check_reset(unsigned long data)
                if (sc_adapter[card]->StartOnReset)
                        startproc(card);
        } else  {
-               pr_debug("%s: No signature yet, waiting another %d jiffies.\n", 
+               pr_debug("%s: No signature yet, waiting another %lu jiffies.\n",
                        sc_adapter[card]->devicename, CHECKRESET_TIME);
                mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
                spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);