diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-08 12:05:34 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-08 12:05:34 +0000 |
| commit | 73c5fb6887d21bdbe4c5aec07f132e0010a554da (patch) | |
| tree | 29aed676055bf337c38c7be489cb544df9fe9c1e /linux/include | |
| parent | 1dcaf3c6fe06fdbc838908e5b109d9c9aa510835 (diff) | |
| download | mediapointer-dvb-s2-73c5fb6887d21bdbe4c5aec07f132e0010a554da.tar.gz mediapointer-dvb-s2-73c5fb6887d21bdbe4c5aec07f132e0010a554da.tar.bz2 | |
i2c fixes and cleanups
- Miscelaneous i2c cleanups and fixes to work with kernel >2.6.15
- linux/sound/pci/bt87x.c updated to kernel version.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/tuner.h | 16 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 6 |
2 files changed, 21 insertions, 1 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 2f5f8a1be..f62c95152 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,5 @@ /* - $Id: tuner.h,v 1.71 2006/01/02 22:31:44 hverkuil Exp $ + $Id: tuner.h,v 1.72 2006/01/08 12:05:34 mchehab Exp $ tuner.h - definition for different tuners Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de) @@ -212,6 +212,7 @@ 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); +#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, \ i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0) @@ -223,6 +224,19 @@ extern int tea5767_autodetection(struct i2c_client *c); if (debug) \ printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ 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 debug; \ + if (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 /* __KERNEL__ */ diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 7bfc609e1..d7ee8f2f9 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -34,9 +34,15 @@ #define v4l_printk(level, name, adapter, addr, fmt, arg...) \ printk(level "%s %d-%04x: " fmt, name, i2c_adapter_id(adapter), addr , ## arg) +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define v4l_client_printk(level, client, fmt, arg...) \ v4l_printk(level, (client)->driver->name, (client)->adapter, \ (client)->addr, fmt , ## arg) +#else +#define v4l_client_printk(level, client, fmt, arg...) \ + v4l_printk(level, (client)->driver->driver.name, (client)->adapter, \ + (client)->addr, fmt , ## arg) +#endif #define v4l_err(client, fmt, arg...) \ v4l_client_printk(KERN_ERR, client, fmt , ## arg) |