From a1ed551cdb4f29157466340760fde68bcda704a9 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 9 Dec 2006 11:41:59 -0300 Subject: V4L/DVB (4941): Remove LINUX_VERSION_CODE and fix identations Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/usbvision/usbvision-i2c.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'drivers/media/video/usbvision/usbvision-i2c.c') diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index 2de74e48cbe5..92bf9a1f1e2c 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c @@ -29,7 +29,7 @@ #include #include #include - #include +#include #include #include #include @@ -350,13 +350,9 @@ static int detach_inform(struct i2c_client *client) { struct usb_usbvision *usbvision; - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - usbvision = (struct usb_usbvision *)client->adapter->data; - #else - usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter); - #endif + usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter); - PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name); + PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name); return 0; } @@ -548,9 +544,9 @@ static struct i2c_adapter i2c_adap_template = { .algo_data = NULL, .client_register = attach_inform, .client_unregister = detach_inform, -#if defined (I2C_ADAP_CLASS_TV_ANALOG) +#ifdef I2C_ADAP_CLASS_TV_ANALOG .class = I2C_ADAP_CLASS_TV_ANALOG, -#elif defined (I2C_CLASS_TV_ANALOG) +#else .class = I2C_CLASS_TV_ANALOG, #endif }; -- cgit v1.2.3