diff options
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index 3c0e2b316..6ac63245d 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -32,21 +32,6 @@ static int debug; module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) -#define tvp5150_err(fmt, arg...) do { \ - printk(KERN_INFO "%s %d-%04x: " fmt, c->driver->name, \ - i2c_adapter_id(c->adapter), c->addr , ## arg); } while (0) -#define tvp5150_info(fmt, arg...) do { \ - printk(KERN_INFO "%s %d-%04x: " fmt, c->driver->name, \ - i2c_adapter_id(c->adapter), c->addr , ## arg); } while (0) -#define tvp5150_dbg(num, fmt, arg...) \ - do { \ - if (debug >= num) \ - printk(KERN_DEBUG "%s debug %d-%04x: " fmt,\ - c->driver->name, \ - i2c_adapter_id(c->adapter), \ - c->addr , ## arg); } while (0) -#else #define tvp5150_err(fmt, arg...) do { \ printk(KERN_ERR "%s %d-%04x: " fmt, c->driver->driver.name, \ i2c_adapter_id(c->adapter), c->addr , ## arg); } while (0) @@ -60,7 +45,6 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); c->driver->driver.name, \ i2c_adapter_id(c->adapter), \ c->addr , ## arg); } while (0) -#endif /* supported controls */ static struct v4l2_queryctrl tvp5150_qctrl[] = { @@ -1133,9 +1117,6 @@ static struct i2c_driver driver; static struct i2c_client client_template = { .name = "(unset)", -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - .flags = I2C_CLIENT_ALLOW_USE, -#endif .driver = &driver, }; @@ -1225,15 +1206,9 @@ static int tvp5150_detach_client(struct i2c_client *c) /* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - .owner = THIS_MODULE, - .name = "tvp5150", - .flags = I2C_DF_NOTIFY, -#else .driver = { .name = "tvp5150", }, -#endif .id = I2C_DRIVERID_TVP5150, .attach_adapter = tvp5150_attach_adapter, |