V4L/DVB (7402): add macro validation for v4l_compat_ioctl32

Added macro CONFIG_COMPAT for v4l_compat_ioctl32.

Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

38 files changed, 76 insertions, 0 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 36c0e3651502..4e3f83e4e48f 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -438,7 +438,9 @@ static const struct file_operations usb_dsbr100_fops = {
         .open           = usb_dsbr100_open,
         .release        = usb_dsbr100_close,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 3ae56fef8c92..09fe6f1cdf14 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -221,7 +221,9 @@ static const struct file_operations pcm20_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = pcm20_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index c69bde39a233..1ec18ed1a733 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -382,7 +382,9 @@ static const struct file_operations rtrack_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 9b1f7a99dac0..46cdb549eac7 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -346,7 +346,9 @@ static const struct file_operations aztech_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 265c4ea95502..b14db53ea456 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -563,7 +563,9 @@ static const struct file_operations cadet_fops = {
         .read           = cadet_read,
         .ioctl          = video_ioctl2,
         .poll           = cadet_poll,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 99a323131333..de49be971480 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -368,7 +368,9 @@ static const struct file_operations gemtek_pci_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 246422b49267..81f6aeb1cd11 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -397,7 +397,9 @@ static const struct file_operations gemtek_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek
 };
 
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index bc51f4d23a5a..bddd3c409aa9 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -100,7 +100,9 @@ static const struct file_operations maestro_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 8e184cfc1c94..0133ecf3e040 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -103,7 +103,9 @@ static const struct file_operations maxiradio_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 82aedfc95d4f..070802103dc3 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -288,7 +288,9 @@ static const struct file_operations rtrack2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 53e114857377..66e052fd3909 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -288,7 +288,9 @@ static const struct file_operations fmi_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 7bf7d534c042..b0ccf7cb5952 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -404,7 +404,9 @@ static const struct file_operations fmr2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 4ad88ee616fd..77354ca6e8e9 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1051,7 +1051,9 @@ static const struct file_operations si470x_fops = {
         .read           = si470x_fops_read,
         .poll           = si470x_fops_poll,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .open           = si470x_fops_open,
         .release        = si470x_fops_release,
 };
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 535ffe8c8102..acc32080e9bd 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -360,7 +360,9 @@ static const struct file_operations terratec_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index c11981fed827..4ebdfbadeb9c 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -340,7 +340,9 @@ static const struct file_operations trust_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 02e3a2f05eee..8b9888337bd1 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -340,7 +340,9 @@ static const struct file_operations typhoon_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 203f4373eeb8..43773c56c62f 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -401,7 +401,9 @@ static const struct file_operations zoltrix_fops =
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index e4d891b29f63..8c7d1958856b 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -747,7 +747,9 @@ static const struct file_operations ar_fops = {
         .release        = video_exclusive_release,
         .read           = ar_read,
         .ioctl          = ar_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 40a8e92a01b9..b364adaae78d 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -898,7 +898,9 @@ static const struct file_operations qcam_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = qcam_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .read           = qcam_read,
         .llseek         = no_llseek,
 };
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index d4d5adfb0351..2c85ced61150 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -689,7 +689,9 @@ static const struct file_operations qcam_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = qcam_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .read           = qcam_read,
         .llseek         = no_llseek,
 };
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 7c630f5ee725..2a81376ef503 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3792,7 +3792,9 @@ static const struct file_operations cpia_fops = {
         .read           = cpia_read,
         .mmap           = cpia_mmap,
         .ioctl          = cpia_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index e378abec806d..7ce2789fa976 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1927,7 +1927,9 @@ static const struct file_operations fops_template = {
         .poll           = cpia2_v4l_poll,
         .ioctl          = cpia2_ioctl,
         .llseek         = no_llseek,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .mmap           = cpia2_mmap,
 };
 
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 32ebb71097b5..5e749c528a62 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -2523,7 +2523,9 @@ static const struct file_operations et61x251_fops = {
         .open =    et61x251_open,
         .release = et61x251_release,
         .ioctl =   et61x251_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .read =    et61x251_read,
         .poll =    et61x251_poll,
         .mmap =    et61x251_mmap,
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index caa9a7ac6184..61c980193c10 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1761,7 +1761,9 @@ static const struct file_operations meye_fops = {
         .release        = meye_release,
         .mmap           = meye_mmap,
         .ioctl          = meye_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .poll           = meye_poll,
         .llseek         = no_llseek,
 };
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 6590058e8ff0..48ee2d892396 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4659,7 +4659,9 @@ static const struct file_operations ov511_fops = {
         .read =         ov51x_v4l1_read,
         .mmap =         ov51x_v4l1_mmap,
         .ioctl =        ov51x_v4l1_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek =       no_llseek,
 };
 
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 4a6c5723f7cc..51b1461d8fb6 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -885,7 +885,9 @@ static const struct file_operations pms_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = pms_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .read           = pms_read,
         .llseek         = no_llseek,
 };
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index b6240a1a606f..d2941c5656ca 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -159,7 +159,9 @@ static const struct file_operations pwc_fops = {
         .poll =         pwc_video_poll,
         .mmap =         pwc_video_mmap,
         .ioctl =        pwc_video_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek =       no_llseek,
 };
 static struct video_device pwc_template = {
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index f55d6e85f20f..ec8c65dc8408 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -701,7 +701,9 @@ static const struct file_operations saa_fops = {
         .open           = saa5249_open,
         .release        = saa5249_release,
         .ioctl          = saa5249_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index f17a539857d4..7b8cd30437c3 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1224,7 +1224,9 @@ static const struct file_operations se401_fops = {
         .read =         se401_read,
         .mmap =         se401_mmap,
         .ioctl =        se401_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek =       no_llseek,
 };
 static struct video_device se401_template = {
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 94f393eebd51..898ae5f578cb 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -3224,7 +3224,9 @@ static const struct file_operations sn9c102_fops = {
         .open = sn9c102_open,
         .release = sn9c102_release,
         .ioctl = sn9c102_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .read = sn9c102_read,
         .poll = sn9c102_poll,
         .mmap = sn9c102_mmap,
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 3118dd322b24..c109511f21ea 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1906,7 +1906,9 @@ static const struct file_operations saa_fops = {
         .open = saa_open,
         .release = saa_release,
         .ioctl = saa_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .read = saa_read,
         .llseek = no_llseek,
         .write = saa_write,
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 1542797c048f..78730294454e 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1394,7 +1394,9 @@ static const struct file_operations stv680_fops = {
         .read =         stv680_read,
         .mmap =         stv680_mmap,
         .ioctl =        stv680_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek =       no_llseek,
 };
 static struct video_device stv680_template = {
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 7f3cdc9a0624..300188097de6 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -946,7 +946,9 @@ static const struct file_operations usbvideo_fops = {
         .read =   usbvideo_v4l_read,
         .mmap =   usbvideo_v4l_mmap,
         .ioctl =  usbvideo_v4l_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index da1ba0211108..4d4795ae3bc7 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -1066,7 +1066,9 @@ static const struct file_operations vicam_fops = {
         .read           = vicam_read,
         .mmap           = vicam_mmap,
         .ioctl          = vicam_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index cc8c8246c30e..cdb396d9203c 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -188,7 +188,9 @@ static const struct file_operations w9966_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = w9966_v4l_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .read           = w9966_v4l_read,
         .llseek         = no_llseek,
 };
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index cce23d24e6fc..840522442d07 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3461,7 +3461,9 @@ static const struct file_operations w9968cf_fops = {
         .release = w9968cf_release,
         .read =    w9968cf_read,
         .ioctl =   w9968cf_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .mmap =    w9968cf_mmap,
         .llseek =  no_llseek,
 };
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index af357cbcb9bb..363dd2b9475c 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1925,7 +1925,9 @@ static const struct file_operations zc0301_fops = {
         .open =    zc0301_open,
         .release = zc0301_release,
         .ioctl =   zc0301_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .read =    zc0301_read,
         .poll =    zc0301_poll,
         .mmap =    zc0301_mmap,
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 5cca61cb8ba8..8c0a379071e5 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -4644,7 +4644,9 @@ static const struct file_operations zoran_fops = {
         .open = zoran_open,
         .release = zoran_close,
         .ioctl = zoran_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek = no_llseek,
         .read = zoran_read,
         .write = zoran_write,