[PATCH] isdn: more pr_debug() fixes (3879b6b6) · Commits · 戴 / test

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>

drivers/isdn/sc/event.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);

drivers/isdn/sc/interrupt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/isdn/sc/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message