Commit 3baba482 authored by Kai Germaschewski's avatar Kai Germaschewski

ISDN: __FUNCTION__ cleanup

Newer gcc's don't like string concat with __FUNCTION__, so
use %s and __FUNCTION__ as argument.
parent 6f124a96
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <linux/isdn/capilli.h> #include <linux/isdn/capilli.h>
#define DBG(format, arg...) do { \ #define DBG(format, arg...) do { \
printk(KERN_DEBUG __FUNCTION__ ": " format "\n" , ## arg); \ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
} while (0) } while (0)
struct capilib_msgidqueue { struct capilib_msgidqueue {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/isdn/capilli.h> #include <linux/isdn/capilli.h>
#define DBG(format, arg...) do { \ #define DBG(format, arg...) do { \
printk(KERN_INFO __FUNCTION__ ": " format "\n" , ## arg); \ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
} while (0) } while (0)
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define DBG(level, format, arg...) do { \ #define DBG(level, format, arg...) do { \
if (level & __debug_variable) \ if (level & __debug_variable) \
printk(KERN_DEBUG __FUNCTION__ ": " format "\n" , ## arg); \ printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
} while (0) } while (0)
#define DBG_PACKET(level,data,count) \ #define DBG_PACKET(level,data,count) \
......
...@@ -219,13 +219,13 @@ enum { ...@@ -219,13 +219,13 @@ enum {
#define L1_EVENT_COUNT (EV_TIMER3 + 1) #define L1_EVENT_COUNT (EV_TIMER3 + 1)
#define ERR(format, arg...) \ #define ERR(format, arg...) \
printk(KERN_ERR __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) printk(KERN_ERR __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)
#define WARN(format, arg...) \ #define WARN(format, arg...) \
printk(KERN_WARNING __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) printk(KERN_WARNING __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)
#define INFO(format, arg...) \ #define INFO(format, arg...) \
printk(KERN_INFO __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) printk(KERN_INFO __FILE__ ": %s: " format "\n" , __FUNCTION__ , ## arg)
#include "st5481_hdlc.h" #include "st5481_hdlc.h"
#include "fsm.h" #include "fsm.h"
......
...@@ -499,7 +499,7 @@ isdn_net_dial_timer(unsigned long data) ...@@ -499,7 +499,7 @@ isdn_net_dial_timer(unsigned long data)
isdn_BUG(); isdn_BUG();
return; return;
} }
printk("%s: %s %#x\n", __FUNCTION__, lp->name, lp->dial_event); printk("%s: %s %#x\n", __FUNCTION__ , lp->name, lp->dial_event);
isdn_net_handle_event(lp, lp->dial_event, NULL); isdn_net_handle_event(lp, lp->dial_event, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment