diff options
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stv0299.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index caa5d81d7..4ec231c02 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -1376,11 +1376,7 @@ static int attach_adapter(struct i2c_adapter *adapter) memcpy(client, &client_template, sizeof(struct i2c_client)); client->adapter = adapter; client->addr = (0x68>>1); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - client->data = state; -#else i2c_set_clientdata(client, (void*)state); -#endif if (0 != i2c_attach_client(client)) { kfree(client); @@ -1399,11 +1395,7 @@ static int detach_client(struct i2c_client *client) static int command (struct i2c_client *client, unsigned int cmd, void *arg) { -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - struct stv0299_data *data = (struct stv0299_data*)client->data; -#else struct stv0299_data *data = (struct stv0299_data*)i2c_get_clientdata(client); -#endif dprintk ("%s\n", __FUNCTION__); @@ -1424,9 +1416,7 @@ static int command (struct i2c_client *client, unsigned int cmd, void *arg) } static struct i2c_driver driver = { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) .owner = THIS_MODULE, -#endif .name = "stv0299", .id = I2C_DRIVERID_STV0299, .flags = I2C_DF_NOTIFY, @@ -1436,11 +1426,7 @@ static struct i2c_driver driver = { }; static struct i2c_client client_template = { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) I2C_DEVNAME("stv0299"), -#else - .name = "stv0299", -#endif .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, }; |