summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/pwc-ioctl.h7
-rw-r--r--linux/include/media/v4l2-dev.h15
-rw-r--r--linux/include/media/v4l2-i2c-drv-legacy.h28
-rw-r--r--linux/include/media/v4l2-i2c-drv.h28
-rw-r--r--linux/include/media/videobuf-dvb.h4
5 files changed, 3 insertions, 79 deletions
diff --git a/linux/include/media/pwc-ioctl.h b/linux/include/media/pwc-ioctl.h
index 6e32ef4e2..0f19779c4 100644
--- a/linux/include/media/pwc-ioctl.h
+++ b/linux/include/media/pwc-ioctl.h
@@ -55,12 +55,7 @@
#include <linux/types.h>
#include <linux/version.h>
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 10)
-/* Compatibility for older kernel */
-typedef __u16 __le16;
-#endif
-
- /* Enumeration of image sizes */
+/* Enumeration of image sizes */
#define PSZ_SQCIF 0x00
#define PSZ_QSIF 0x01
#define PSZ_QCIF 0x02
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h
index d1ca9664e..fb356eb57 100644
--- a/linux/include/media/v4l2-dev.h
+++ b/linux/include/media/v4l2-dev.h
@@ -14,9 +14,7 @@
#include <linux/poll.h>
#include <linux/fs.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
#include <linux/device.h>
-#endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
#else
@@ -97,15 +95,9 @@ struct video_device
struct file_operations *fops;
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
/* sysfs */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
struct device class_dev; /* v4l device */
-#else
- struct class_device class_dev;
-#endif
struct device *dev; /* device parent */
-#endif
/* device info */
char name[32];
@@ -399,15 +391,9 @@ extern int video_usercopy(struct inode *inode, struct file *file,
#ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/mm.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
static inline int __must_check
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-video_device_create_file(struct video_device *vfd,
- struct class_device_attribute *attr)
-#else
video_device_create_file(struct video_device *vfd,
struct device_attribute *attr)
-#endif
{
int ret = device_create_file(&vfd->class_dev, attr);
if (ret < 0)
@@ -420,7 +406,6 @@ video_device_remove_file(struct video_device *vfd,
{
device_remove_file(&vfd->class_dev, attr);
}
-#endif
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
diff --git a/linux/include/media/v4l2-i2c-drv-legacy.h b/linux/include/media/v4l2-i2c-drv-legacy.h
index e95e2a072..738f87454 100644
--- a/linux/include/media/v4l2-i2c-drv-legacy.h
+++ b/linux/include/media/v4l2-i2c-drv-legacy.h
@@ -30,11 +30,7 @@ struct v4l2_i2c_driver_data {
int (*suspend)(struct i2c_client *client, pm_message_t state);
int (*resume)(struct i2c_client *client);
int (*legacy_probe)(struct i2c_adapter *adapter);
-#ifdef I2C_CLASS_TV_ANALOG
int legacy_class;
-#else
- int legacy_id;
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
const struct i2c_device_id *id_table;
#endif
@@ -49,12 +45,7 @@ static struct i2c_client_address_data addr_data;
static struct i2c_driver v4l2_i2c_driver_legacy;
static char v4l2_i2c_drv_name_legacy[32];
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-#else
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address,
- unsigned short flags, int kind)
-#endif
{
return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver_legacy,
v4l2_i2c_drv_name_legacy, v4l2_i2c_data.probe);
@@ -67,11 +58,7 @@ static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
return 0;
}
-#ifdef I2C_CLASS_TV_ANALOG
if (adapter->class & v4l2_i2c_data.legacy_class)
-#else
- if (adapter->id == v4l2_i2c_data.legacy_id)
-#endif
return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
return 0;
}
@@ -87,14 +74,9 @@ static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
if (err)
return err;
kfree(client);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- MOD_DEC_USE_COUNT;
-#endif
return 0;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)
static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
@@ -130,19 +112,17 @@ static int v4l2_i2c_drv_resume_helper(struct device * dev, u32 level)
#endif
return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
}
-#endif
/* ----------------------------------------------------------------------- */
/* i2c implementation */
static struct i2c_driver v4l2_i2c_driver_legacy = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.flags = I2C_DF_NOTIFY,
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
.driver = {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
@@ -152,7 +132,6 @@ static struct i2c_driver v4l2_i2c_driver_legacy = {
.resume = v4l2_i2c_drv_resume_helper,
#endif
},
-#endif
.attach_adapter = v4l2_i2c_drv_probe_legacy,
.detach_client = v4l2_i2c_drv_detach_legacy,
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)
@@ -184,13 +163,8 @@ static int __init v4l2_i2c_drv_init(void)
strlcpy(v4l2_i2c_drv_name_legacy, v4l2_i2c_data.name, sizeof(v4l2_i2c_drv_name_legacy));
strlcat(v4l2_i2c_drv_name_legacy, "'", sizeof(v4l2_i2c_drv_name_legacy));
-#ifdef I2C_CLASS_TV_ANALOG
if (v4l2_i2c_data.legacy_class == 0)
v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-#else
- if (v4l2_i2c_data.legacy_id == 0)
- v4l2_i2c_data.legacy_id = I2C_HW_B_BT848;
-#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
strlcpy(v4l2_i2c_driver_legacy.name, v4l2_i2c_drv_name_legacy, sizeof(v4l2_i2c_driver_legacy.name));
diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h
index 73d713f07..f74c8a64a 100644
--- a/linux/include/media/v4l2-i2c-drv.h
+++ b/linux/include/media/v4l2-i2c-drv.h
@@ -35,11 +35,7 @@ struct v4l2_i2c_driver_data {
int (*suspend)(struct i2c_client *client, pm_message_t state);
int (*resume)(struct i2c_client *client);
int (*legacy_probe)(struct i2c_adapter *adapter);
-#ifdef I2C_CLASS_TV_ANALOG
int legacy_class;
-#else
- int legacy_id;
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
const struct i2c_device_id *id_table;
#endif
@@ -83,12 +79,7 @@ static struct i2c_client_address_data addr_data;
/* Bus-based I2C API is not present, add legacy code */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-#else
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address,
- unsigned short flags, int kind)
-#endif
{
return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver,
v4l2_i2c_data.name, v4l2_i2c_data.probe);
@@ -101,11 +92,7 @@ static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
return 0;
}
-#ifdef I2C_CLASS_TV_ANALOG
if (adapter->class & v4l2_i2c_data.legacy_class)
-#else
- if (adapter->id == v4l2_i2c_data.legacy_id)
-#endif
return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
return 0;
}
@@ -121,14 +108,9 @@ static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
if (err)
return err;
kfree(client);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- MOD_DEC_USE_COUNT;
-#endif
return 0;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)
static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
@@ -164,18 +146,16 @@ static int v4l2_i2c_drv_resume_helper(struct device * dev, u32 level)
#endif
return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
}
-#endif
/* ----------------------------------------------------------------------- */
static struct i2c_driver v4l2_i2c_driver = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.flags = I2C_DF_NOTIFY,
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
.driver = {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
@@ -185,7 +165,6 @@ static struct i2c_driver v4l2_i2c_driver = {
.resume = v4l2_i2c_drv_resume_helper,
#endif
},
-#endif
.attach_adapter = v4l2_i2c_drv_probe_legacy,
.detach_client = v4l2_i2c_drv_detach_legacy,
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)
@@ -198,13 +177,8 @@ static struct i2c_driver v4l2_i2c_driver = {
static int __init v4l2_i2c_drv_init(void)
{
-#ifdef I2C_CLASS_TV_ANALOG
if (v4l2_i2c_data.legacy_class == 0)
v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-#else
- if (v4l2_i2c_data.legacy_id == 0)
- v4l2_i2c_data.legacy_id = I2C_HW_B_BT848;
-#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
strlcpy(v4l2_i2c_driver.name, v4l2_i2c_data.name, sizeof(v4l2_i2c_driver.name));
diff --git a/linux/include/media/videobuf-dvb.h b/linux/include/media/videobuf-dvb.h
index 14438bc98..84886be5e 100644
--- a/linux/include/media/videobuf-dvb.h
+++ b/linux/include/media/videobuf-dvb.h
@@ -20,11 +20,7 @@ struct videobuf_dvb {
int nfeeds;
/* videobuf_dvb_(un)register manges this */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
struct dvb_adapter adapter;
-#else
- struct dvb_adapter *adapter;
-#endif
struct dvb_demux demux;
struct dmxdev dmxdev;
struct dmx_frontend fe_hw;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 19:14:10 +0000