From 4c05c1b997ebd8812f753e15ec29b587ee9eec5b Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Thu, 9 Feb 2012 15:24:40 +0000 Subject: code cleanup - refactor module_printk() * Remove multiple definitions * Move canonical one to include/dahdi/kernel.h Signed-off-by: Oron Peled Acked-by: Tzafrir Cohen git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10458 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi-base.c | 1 - drivers/dahdi/dahdi-sysfs.c | 4 ---- drivers/dahdi/dahdi_echocan_jpah.c | 1 - drivers/dahdi/dahdi_echocan_kb1.c | 1 - drivers/dahdi/dahdi_echocan_mg2.c | 1 - drivers/dahdi/dahdi_echocan_oslec.c | 2 -- drivers/dahdi/dahdi_echocan_sec.c | 1 - drivers/dahdi/dahdi_echocan_sec2.c | 1 - drivers/dahdi/hpec/dahdi_echocan_hpec.c | 1 - include/dahdi/kernel.h | 4 ++++ 10 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 907d0f4..7e23abc 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -60,7 +60,6 @@ #include #define DAHDI_PRINK_MACROS_USE_debug -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) /* Grab fasthdlc with tables */ #define FAST_HDLC_NEED_TABLES diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index 055ccd9..3641606 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -7,10 +7,6 @@ #include "dahdi.h" -/* FIXME: Move to kernel.h */ -#define module_printk(level, fmt, args...) \ - printk(level "%s: " fmt, THIS_MODULE->name, ## args) - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) #define CLASS_DEV_CREATE(class, devt, device, name) \ device_create(class, device, devt, NULL, "%s", name) diff --git a/drivers/dahdi/dahdi_echocan_jpah.c b/drivers/dahdi/dahdi_echocan_jpah.c index 167460c..d9687ca 100644 --- a/drivers/dahdi/dahdi_echocan_jpah.c +++ b/drivers/dahdi/dahdi_echocan_jpah.c @@ -38,7 +38,6 @@ static int debug; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) static int echo_can_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, diff --git a/drivers/dahdi/dahdi_echocan_kb1.c b/drivers/dahdi/dahdi_echocan_kb1.c index cf58260..6b7dbe8 100644 --- a/drivers/dahdi/dahdi_echocan_kb1.c +++ b/drivers/dahdi/dahdi_echocan_kb1.c @@ -44,7 +44,6 @@ static int debug; static int aggressive; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) /* Uncomment to provide summary statistics for overall echo can performance every 4000 samples */ diff --git a/drivers/dahdi/dahdi_echocan_mg2.c b/drivers/dahdi/dahdi_echocan_mg2.c index 4713ed8..8ea3f78 100644 --- a/drivers/dahdi/dahdi_echocan_mg2.c +++ b/drivers/dahdi/dahdi_echocan_mg2.c @@ -44,7 +44,6 @@ static int debug; static int aggressive; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) #define ABS(a) abs(a!=-32768?a:-32767) diff --git a/drivers/dahdi/dahdi_echocan_oslec.c b/drivers/dahdi/dahdi_echocan_oslec.c index 805597a..931f82b 100644 --- a/drivers/dahdi/dahdi_echocan_oslec.c +++ b/drivers/dahdi/dahdi_echocan_oslec.c @@ -36,8 +36,6 @@ #include -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) - static int echo_can_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec); static void echo_can_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec); diff --git a/drivers/dahdi/dahdi_echocan_sec.c b/drivers/dahdi/dahdi_echocan_sec.c index 5f6f9ae..b5b6603 100644 --- a/drivers/dahdi/dahdi_echocan_sec.c +++ b/drivers/dahdi/dahdi_echocan_sec.c @@ -48,7 +48,6 @@ static int debug; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) #include "arith.h" diff --git a/drivers/dahdi/dahdi_echocan_sec2.c b/drivers/dahdi/dahdi_echocan_sec2.c index a7cc551..8750c85 100644 --- a/drivers/dahdi/dahdi_echocan_sec2.c +++ b/drivers/dahdi/dahdi_echocan_sec2.c @@ -47,7 +47,6 @@ static int debug; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) #include "fir.h" diff --git a/drivers/dahdi/hpec/dahdi_echocan_hpec.c b/drivers/dahdi/hpec/dahdi_echocan_hpec.c index fd7cc6f..4559909 100644 --- a/drivers/dahdi/hpec/dahdi_echocan_hpec.c +++ b/drivers/dahdi/hpec/dahdi_echocan_hpec.c @@ -31,7 +31,6 @@ static int debug; -#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) #define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args) #include "hpec_user.h" diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index b64069e..882d31e 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1516,6 +1516,10 @@ struct mutex { #define DAHDI_PSEUDO 255 /* prink-wrapper macros */ + +#define module_printk(level, fmt, args...) \ + printk(level "%s: " fmt, THIS_MODULE->name, ## args) + #define DAHDI_PRINTK(level, category, fmt, ...) \ printk(KERN_ ## level "%s%s-%s: " fmt, #level, category, \ THIS_MODULE->name, ## __VA_ARGS__) -- cgit v1.2.3