From 333c03b5644f4374a48b5c73059149d6fdd7c0e7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 19 Aug 2005 20:55:05 +0000 Subject: - changed tuner_info from dev_printk to i2c_client info. - used do { } while(0) according with CodingStyle Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/include/media/tuner.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'linux') diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 268ed8bd5..53695e8f3 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,4 @@ - -/* $Id: tuner.h,v 1.47 2005/08/17 19:42:11 nsh Exp $ +/* $Id: tuner.h,v 1.48 2005/08/19 20:55:05 mchehab Exp $ * tuner.h - definition for different tuners @@ -210,12 +209,16 @@ extern int tea5767_tuner_init(struct i2c_client *c); extern int default_tuner_init(struct i2c_client *c); extern int tea5767_autodetection(struct i2c_client *c); -#define tuner_warn(fmt, arg...) \ - dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg) -#define tuner_info(fmt, arg...) \ - dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg) -#define tuner_dbg(fmt, arg...) \ - if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg) +#define tuner_warn(fmt, arg...) do {\ + printk(KERN_WARNING "%s %d-%04d: " fmt, t->i2c.driver->name, \ + t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) +#define tuner_info(fmt, arg...) do {\ + printk(KERN_INFO "%s %d-%04d: " fmt, t->i2c.driver->name, \ + t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) +#define tuner_dbg(fmt, arg...) do {\ + if (tuner_debug) \ + printk(KERN_DEBUG "%s %d-%04d: " fmt, t->i2c.driver->name, \ + t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) #endif /* __KERNEL__ */ -- cgit v1.2.3