3 files changed, 6 insertions, 31 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index c53b64fb8..1f116878d 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -34,6 +34,8 @@
 
 #define UNSET (-1U)
 
+#define PREFIX "tuner "
+
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
 #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
@@ -391,7 +393,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		t->fe.analog_demod_priv = t;
 	}
 
-	tuner_info("type set to %s\n", t->i2c->name);
+	tuner_dbg("type set to %s\n", t->i2c->name);
 
 	if (t->mode_mask == T_UNINITIALIZED)
 		t->mode_mask = new_mode_mask;
diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h
index d5acacebd..1c60229dc 100644
--- a/linux/drivers/media/video/tuner-driver.h
+++ b/linux/drivers/media/video/tuner-driver.h
@@ -70,31 +70,17 @@ struct tuner {
 
 /* ------------------------------------------------------------------------ */
 
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
 #define tuner_warn(fmt, arg...) do {\
-	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c->driver->name, \
+	printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
 #define tuner_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c->driver->name, \
+	printk(KERN_INFO PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
 	extern int tuner_debug; \
 	if (tuner_debug) \
-		printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c->driver->name, \
+		printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
-#else
-#define tuner_warn(fmt, arg...) do {\
-	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
-			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
-#define tuner_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
-			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
-#define tuner_dbg(fmt, arg...) do {\
-	extern int tuner_debug; \
-	if (tuner_debug) \
-		printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c->driver->driver.name, \
-			i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
-#endif
 
 #endif /* __TUNER_DRIVER_H__ */
 
diff --git a/linux/drivers/media/video/tuner-i2c.h b/linux/drivers/media/video/tuner-i2c.h
index 422817129..159019ec3 100644
--- a/linux/drivers/media/video/tuner-i2c.h
+++ b/linux/drivers/media/video/tuner-i2c.h
@@ -47,7 +47,6 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf,
 }
 
 #ifndef __TUNER_DRIVER_H__
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
 #define tuner_warn(fmt, arg...) do {\
 	printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
@@ -58,18 +57,6 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf,
 	if ((debug)) \
 		printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
 			i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
-#else
-#define tuner_warn(fmt, arg...) do {\
-	printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \
-			i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
-#define tuner_info(fmt, arg...) do {\
-	printk(KERN_INFO PREFIX "%d-%04x: " fmt, \
-			i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
-#define tuner_dbg(fmt, arg...) do {\
-	if ((debug)) \
-		printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \
-			i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
-#endif
 #endif /* __TUNER_DRIVER_H__ */
 
 #endif /* __TUNER_I2C_H__ */