diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-30 08:47:57 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-30 08:47:57 -0400 |
| commit | e77871b7c84f213b57e7f34d30e2d9e45f59d8b5 (patch) | |
| tree | 0e318f31e459405e0593fd581ff618bf241f9b92 /linux/drivers/media/video | |
| parent | 038a10c51af779688d9232b546b602e5c5cc8e05 (diff) | |
| download | mediapointer-dvb-s2-e77871b7c84f213b57e7f34d30e2d9e45f59d8b5.tar.gz mediapointer-dvb-s2-e77871b7c84f213b57e7f34d30e2d9e45f59d8b5.tar.bz2 | |
tuner: remove redundant tuner_foo printk macros
From: Michael Krufky <mkrufky@linuxtv.org>
These macros are no longer kernel-version dependant.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/tuner-driver.h | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-i2c.h | 13 |
2 files changed, 0 insertions, 27 deletions
diff --git a/linux/drivers/media/video/tuner-driver.h b/linux/drivers/media/video/tuner-driver.h index 502c88dab..1c60229dc 100644 --- a/linux/drivers/media/video/tuner-driver.h +++ b/linux/drivers/media/video/tuner-driver.h @@ -70,7 +70,6 @@ struct tuner { /* ------------------------------------------------------------------------ */ -#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(t->i2c->adapter), t->i2c->addr , ##arg); } while (0) @@ -82,19 +81,6 @@ struct tuner { if (tuner_debug) \ 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 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 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 PREFIX "%d-%04x: " fmt, \ - 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__ */ |