diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-30 08:46:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:01:51 -0500 |
commit | 241020d19ee9da29171d989ff876c657e4b938b5 (patch) | |
tree | 73183f474616e94a0f4fc2108cb22682a4d049fa | |
parent | 4942744f93884cb462400c66258c0013bea65dcf (diff) |
V4L/DVB (6492): tuner: improve tuner_foo printk macros consistency
Alter the tuner_foo printk macros to indicate which module is
generating the message.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/tuner-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tuner-driver.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index b92efe0460f3..17c873c869af 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -30,6 +30,8 @@ | |||
30 | 30 | ||
31 | #define UNSET (-1U) | 31 | #define UNSET (-1U) |
32 | 32 | ||
33 | #define PREFIX "tuner " | ||
34 | |||
33 | /* standard i2c insmod options */ | 35 | /* standard i2c insmod options */ |
34 | static unsigned short normal_i2c[] = { | 36 | static unsigned short normal_i2c[] = { |
35 | #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE)) | 37 | #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE)) |
diff --git a/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h index 0df136e58eb3..1c60229dcd0a 100644 --- a/drivers/media/video/tuner-driver.h +++ b/drivers/media/video/tuner-driver.h | |||
@@ -71,15 +71,15 @@ struct tuner { | |||
71 | /* ------------------------------------------------------------------------ */ | 71 | /* ------------------------------------------------------------------------ */ |
72 | 72 | ||
73 | #define tuner_warn(fmt, arg...) do {\ | 73 | #define tuner_warn(fmt, arg...) do {\ |
74 | printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \ | 74 | printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \ |
75 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) | 75 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) |
76 | #define tuner_info(fmt, arg...) do {\ | 76 | #define tuner_info(fmt, arg...) do {\ |
77 | printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \ | 77 | printk(KERN_INFO PREFIX "%d-%04x: " fmt, \ |
78 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) | 78 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) |
79 | #define tuner_dbg(fmt, arg...) do {\ | 79 | #define tuner_dbg(fmt, arg...) do {\ |
80 | extern int tuner_debug; \ | 80 | extern int tuner_debug; \ |
81 | if (tuner_debug) \ | 81 | if (tuner_debug) \ |
82 | printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \ | 82 | printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \ |
83 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) | 83 | i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) |
84 | 84 | ||
85 | #endif /* __TUNER_DRIVER_H__ */ | 85 | #endif /* __TUNER_DRIVER_H__ */ |