39 files changed, 7 insertions, 54 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 08bf5e8031da..0edada6f4b31 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -462,7 +462,6 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
 
 /* V4L2 interface */
 static struct video_device dsbr100_videodev_template = {
-        .owner          = THIS_MODULE,
         .name           = "D-Link DSB-R 100",
         .type           = VID_TYPE_TUNER,
         .fops           = &usb_dsbr100_fops,
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 4a332fe8b64b..594e246dfcff 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -229,7 +229,6 @@ static const struct file_operations pcm20_fops = {
 };
 
 static struct video_device pcm20_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Miro PCM 20 radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &pcm20_fops,
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index be9bd7adaf61..2540df6dc2c8 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -405,7 +405,6 @@ static const struct v4l2_ioctl_ops rtrack_ioctl_ops = {
 };
 
 static struct video_device rtrack_radio = {
-        .owner          = THIS_MODULE,
         .name           = "RadioTrack radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &rtrack_fops,
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 04c738b62d06..537f2f479506 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -369,7 +369,6 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
 };
 
 static struct video_device aztech_radio = {
-        .owner              = THIS_MODULE,
         .name               = "Aztech radio",
         .type               = VID_TYPE_TUNER,
         .fops               = &aztech_fops,
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 36b850fc14b4..362a279f0680 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -586,7 +586,6 @@ static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
 };
 
 static struct video_device cadet_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Cadet radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &cadet_fops,
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index c41b35f3b125..b8c515762b49 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -391,7 +391,6 @@ static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
 };
 
 static struct video_device vdev_template = {
-        .owner         = THIS_MODULE,
         .name          = "Gemtek PCI Radio",
         .type          = VID_TYPE_TUNER,
         .fops          = &gemtek_pci_fops,
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index f82b59f35e33..45b47c1643ee 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -569,7 +569,6 @@ static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
 };
 
 static struct video_device gemtek_radio = {
-        .owner                  = THIS_MODULE,
         .name                   = "GemTek Radio card",
         .type                   = VID_TYPE_TUNER,
         .fops                   = &gemtek_fops,
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 780516daebba..1b9099606494 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -390,7 +390,6 @@ static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
 };
 
 static struct video_device maxiradio_radio = {
-        .owner              = THIS_MODULE,
         .name               = "Maxi Radio FM2000 radio",
         .type               = VID_TYPE_TUNER,
         .fops               = &maxiradio_fops,
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 045ae9d1067c..e065cb16dc5a 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -311,7 +311,6 @@ static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
 };
 
 static struct video_device rtrack2_radio = {
-        .owner          = THIS_MODULE,
         .name           = "RadioTrack II radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &rtrack2_fops,
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 75b68a024541..975f8521848a 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -311,7 +311,6 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
 };
 
 static struct video_device fmi_radio = {
-        .owner          = THIS_MODULE,
         .name           = "SF16FMx radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &fmi_fops,
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 5ffddce80011..2786722b4946 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -427,7 +427,6 @@ static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
 };
 
 static struct video_device fmr2_radio = {
-        .owner          = THIS_MODULE,
         .name           = "SF16FMR2 radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &fmr2_fops,
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index b829c67ecf0c..3cf78ccdc58f 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1611,7 +1611,6 @@ static struct video_device si470x_viddev_template = {
         .name                   = DRIVER_NAME,
         .type                   = VID_TYPE_TUNER,
         .release                = video_device_release,
-        .owner                  = THIS_MODULE,
 };
 
 
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 3a67471f999c..b3f669d0691f 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -383,7 +383,6 @@ static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
 };
 
 static struct video_device terratec_radio = {
-        .owner          = THIS_MODULE,
         .name           = "TerraTec ActiveRadio",
         .type           = VID_TYPE_TUNER,
         .fops           = &terratec_fops,
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index e33400180915..74aefda868e6 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -363,7 +363,6 @@ static const struct v4l2_ioctl_ops trust_ioctl_ops = {
 };
 
 static struct video_device trust_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Trust FM Radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &trust_fops,
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 48b5d2bc6276..6eb39b7ab75e 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -361,7 +361,6 @@ static const struct v4l2_ioctl_ops typhoon_ioctl_ops = {
 };
 
 static struct video_device typhoon_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Typhoon Radio",
         .type           = VID_TYPE_TUNER,
         .fops           = &typhoon_fops,
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index c60344326cd6..4afcb09a4af3 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -424,7 +424,6 @@ static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = {
 };
 
 static struct video_device zoltrix_radio = {
-        .owner          = THIS_MODULE,
         .name           = "Zoltrix Radio Plus",
         .type           = VID_TYPE_TUNER,
         .fops           = &zoltrix_fops,
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index e367862313e1..ec870c781c02 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -907,7 +907,6 @@ static const struct file_operations qcam_fops = {
 };
 static struct video_device qcam_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Connectix Quickcam",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 8d690410c84f..62ed8949d461 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -702,7 +702,6 @@ static const struct file_operations qcam_fops = {
 
 static struct video_device qcam_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Colour QuickCam",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &qcam_fops,
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 2a81376ef503..5d2ef48137c4 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3799,7 +3799,6 @@ static const struct file_operations cpia_fops = {
 };
 
 static struct video_device cpia_template = {
-        .owner          = THIS_MODULE,
         .name           = "CPiA Camera",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &cpia_fops,
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 8817c3841463..4e45de78df59 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1936,7 +1936,6 @@ static const struct file_operations fops_template = {
 
 static struct video_device cpia2_template = {
         /* I could not find any place for the old .initialize initializer?? */
-        .owner=         THIS_MODULE,
         .name=          "CPiA2 Camera",
         .type=          VID_TYPE_CAPTURE,
         .type2 =        V4L2_CAP_VIDEO_CAPTURE |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 8cd5f37425ea..3e71ea7bbe24 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -2585,7 +2585,6 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &et61x251_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index fd16ef0a5868..f9a6e1e8b4bd 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1720,7 +1720,6 @@ static const struct v4l2_ioctl_ops meye_ioctl_ops = {
 };
 
 static struct video_device meye_template = {
-        .owner          = THIS_MODULE,
         .name           = "meye",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &meye_fops,
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index b72e5660bc19..f732b035570f 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4666,7 +4666,6 @@ static const struct file_operations ov511_fops = {
 };
 
 static struct video_device vdev_template = {
-        .owner =        THIS_MODULE,
         .name =         "OV511 USB Camera",
         .type =         VID_TYPE_CAPTURE,
         .fops =         &ov511_fops,
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 260c1d3f9692..8c72e4df85ab 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -895,7 +895,6 @@ static const struct file_operations pms_fops = {
 
 static struct video_device pms_template=
 {
-        .owner          = THIS_MODULE,
         .name           = "Mediavision PMS",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &pms_fops,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index bd6169fbdcca..ceb549ac752d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1161,7 +1161,6 @@ static const struct file_operations vdev_fops = {
 
 
 static struct video_device vdev_template = {
-        .owner      = THIS_MODULE,
         .type       = VID_TYPE_CAPTURE | VID_TYPE_TUNER,
         .type2      = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE
                        | V4L2_CAP_TUNER | V4L2_CAP_AUDIO
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index b4de82115e5b..4625b265bf98 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -165,7 +165,6 @@ static const struct file_operations pwc_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device pwc_template = {
-        .owner =        THIS_MODULE,
         .name =         "Philips Webcam",       /* Filled in later */
         .type =         VID_TYPE_CAPTURE,
         .release =      video_device_release,
@@ -1769,7 +1768,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
         memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template));
         pdev->vdev->parent = &(udev->dev);
         strcpy(pdev->vdev->name, name);
-        pdev->vdev->owner = THIS_MODULE;
         video_set_drvdata(pdev->vdev, pdev);
 
         pdev->release = le16_to_cpu(udev->descriptor.bcdDevice);
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 8d69632a6658..e6a3fa482982 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -830,7 +830,6 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .owner    = THIS_MODULE,
         .name     = IF_NAME,
         .type     = VID_TYPE_TELETEXT,
         .fops     = &saa_fops,
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 812cfe3fd3f3..6f14619bda4a 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -711,7 +711,6 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .owner          = THIS_MODULE,
         .name           = IF_NAME,
         .type           = VID_TYPE_TELETEXT,    /*| VID_TYPE_TUNER ?? */
         .fops           = &saa_fops,
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index 1cd629380f71..b4dd60b0f8f2 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1230,7 +1230,6 @@ static const struct file_operations se401_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device se401_template = {
-        .owner =        THIS_MODULE,
         .name =         "se401 USB camera",
         .type =         VID_TYPE_CAPTURE,
         .fops =         &se401_fops,
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 475b78191151..c68bf0921e9e 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -3309,7 +3309,6 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "SN9C1xx PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &sn9c102_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index da94d3fd8fac..fdcb58b0c121 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1401,7 +1401,6 @@ static const struct file_operations stv680_fops = {
         .llseek =       no_llseek,
 };
 static struct video_device stv680_template = {
-        .owner =        THIS_MODULE,
         .name =         "STV0680 USB camera",
         .type =         VID_TYPE_CAPTURE,
         .fops =         &stv680_fops,
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 7e6ab2910c13..357cee40fb38 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -952,7 +952,6 @@ static const struct file_operations usbvideo_fops = {
         .llseek = no_llseek,
 };
 static const struct video_device usbvideo_template = {
-        .owner =      THIS_MODULE,
         .type =       VID_TYPE_CAPTURE,
         .fops =       &usbvideo_fops,
 };
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 40d053e0d5bf..e2dec6fb0da9 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -791,7 +791,6 @@ static const struct file_operations vicam_fops = {
 };
 
 static struct video_device vicam_template = {
-        .owner          = THIS_MODULE,
         .name           = "ViCam-based USB Camera",
         .type           = VID_TYPE_CAPTURE,
         .fops           = &vicam_fops,
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 7eccdc1ea2d7..e97f955aad67 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1406,7 +1406,6 @@ static const struct v4l2_ioctl_ops usbvision_ioctl_ops = {
 };
 
 static struct video_device usbvision_video_template = {
-        .owner             = THIS_MODULE,
         .type           = VID_TYPE_TUNER | VID_TYPE_CAPTURE,
         .fops           = &usbvision_fops,
         .ioctl_ops      = &usbvision_ioctl_ops,
@@ -1445,7 +1444,6 @@ static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = {
 };
 
 static struct video_device usbvision_radio_template = {
-        .owner             = THIS_MODULE,
         .type           = VID_TYPE_TUNER,
         .fops           = &usbvision_radio_fops,
         .name           = "usbvision-radio",
@@ -1469,7 +1467,6 @@ static const struct file_operations usbvision_vbi_fops = {
 
 static struct video_device usbvision_vbi_template=
 {
-        .owner             = THIS_MODULE,
         .type           = VID_TYPE_TUNER,
         .fops           = &usbvision_vbi_fops,
         .release        = video_device_release,
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index a63e11f8399b..1641998c73e6 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -196,7 +196,6 @@ static const struct file_operations w9966_fops = {
         .llseek         = no_llseek,
 };
 static struct video_device w9966_template = {
-        .owner          = THIS_MODULE,
         .name           = W9966_DRIVERNAME,
         .type           = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
         .fops           = &w9966_fops,
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 56bbeec542c5..8f665953c80c 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3550,7 +3550,6 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, symbolic(camlist, mod_id));
-        cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &w9968cf_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index e5c4e9f5193f..0978a7e946b4 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1985,7 +1985,6 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera");
-        cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
         cam->v4ldev->fops = &zc0301_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 617ed2856b22..36ba36a5e2ea 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -779,7 +779,6 @@ static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = {
 };
 
 static struct video_device zr364xx_template = {
-        .owner = THIS_MODULE,
         .name = DRIVER_DESC,
         .type = VID_TYPE_CAPTURE,
         .fops = &zr364xx_fops,
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index d9149cd25b31..ae2b1e6bdf47 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,6 @@
 #ifndef _V4L2_DEV_H
 #define _V4L2_DEV_H
 
-#define OBSOLETE_OWNER   1 /* to be removed soon */
 #define OBSOLETE_DEVDATA 1 /* to be removed soon */
 
 #include <linux/poll.h>
@@ -76,14 +75,12 @@ struct video_device
         /* ioctl callbacks */
         const struct v4l2_ioctl_ops *ioctl_ops;
 
-#ifdef OBSOLETE_OWNER /* to be removed soon */
-/* obsolete -- fops->owner is used instead */
-struct module *owner;
-/* dev->driver_data will be used instead some day.
-        * Use the video_{get|set}_drvdata() helper functions,
-        * so the switch over will be transparent for you.
-        * Or use {pci|usb}_{get|set}_drvdata() directly. */
-void *priv;
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
+        /* dev->driver_data will be used instead some day.
+         * Use the video_{get|set}_drvdata() helper functions,
+         * so the switch over will be transparent for you.
+         * Or use {pci|usb}_{get|set}_drvdata() directly. */
+        void *priv;
 #endif
 
         /* for videodev.c intenal usage -- please don't touch */
@@ -126,7 +123,7 @@ video_device_remove_file(struct video_device *vfd,
 
 #endif /* CONFIG_VIDEO_V4L1_COMPAT */
 
-#ifdef OBSOLETE_OWNER /* to be removed soon */
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *dev)
 {
@@ -138,9 +135,6 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
         dev->priv = data;
 }
 
-#endif
-
-#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* Obsolete stuff - Still needed for radio devices and obsolete drivers */
 extern struct video_device* video_devdata(struct file*);
 extern int video_exclusive_open(struct inode *inode, struct file *file);