summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2004-05-03 16:29:27 +0000
committerMichael Hunold <devnull@localhost>2004-05-03 16:29:27 +0000
commit1a037915cb36b4ddcad3eed662e8302ca48e6b86 (patch)
treefd50fe4977e792c809864fc32455e975a1ea4b30 /linux/drivers/media/dvb/frontends
parent30970c2a967560590b306f6965aea609d7fd3a54 (diff)
downloadmediapointer-dvb-s2-1a037915cb36b4ddcad3eed662e8302ca48e6b86.tar.gz
mediapointer-dvb-s2-1a037915cb36b4ddcad3eed662e8302ca48e6b86.tar.bz2
- remove 2.4 compat code, expect for ttusb_dec.c
(Alex, do you take care of that one?)
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
-rw-r--r--linux/drivers/media/dvb/frontends/stv0299.c14
-rw-r--r--linux/drivers/media/dvb/frontends/ves1x93.c14
2 files changed, 0 insertions, 28 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,
};
diff --git a/linux/drivers/media/dvb/frontends/ves1x93.c b/linux/drivers/media/dvb/frontends/ves1x93.c
index 93925939d..75523847b 100644
--- a/linux/drivers/media/dvb/frontends/ves1x93.c
+++ b/linux/drivers/media/dvb/frontends/ves1x93.c
@@ -625,11 +625,7 @@ static int attach_adapter(struct i2c_adapter *adapter)
memcpy(client, &client_template, sizeof(struct i2c_client));
client->adapter = adapter;
client->addr = (0x08>>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);
@@ -648,11 +644,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__);
@@ -673,9 +665,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 = "ves1x93",
.id = I2C_DRIVERID_VES1X93,
.flags = I2C_DF_NOTIFY,
@@ -685,11 +675,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 = "ves1x93",
-#endif
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
};