diff options
Diffstat (limited to 'drivers/media')
38 files changed, 0 insertions, 41 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 = { | |||
462 | 462 | ||
463 | /* V4L2 interface */ | 463 | /* V4L2 interface */ |
464 | static struct video_device dsbr100_videodev_template = { | 464 | static struct video_device dsbr100_videodev_template = { |
465 | .owner = THIS_MODULE, | ||
466 | .name = "D-Link DSB-R 100", | 465 | .name = "D-Link DSB-R 100", |
467 | .type = VID_TYPE_TUNER, | 466 | .type = VID_TYPE_TUNER, |
468 | .fops = &usb_dsbr100_fops, | 467 | .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 = { | |||
229 | }; | 229 | }; |
230 | 230 | ||
231 | static struct video_device pcm20_radio = { | 231 | static struct video_device pcm20_radio = { |
232 | .owner = THIS_MODULE, | ||
233 | .name = "Miro PCM 20 radio", | 232 | .name = "Miro PCM 20 radio", |
234 | .type = VID_TYPE_TUNER, | 233 | .type = VID_TYPE_TUNER, |
235 | .fops = &pcm20_fops, | 234 | .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 = { | |||
405 | }; | 405 | }; |
406 | 406 | ||
407 | static struct video_device rtrack_radio = { | 407 | static struct video_device rtrack_radio = { |
408 | .owner = THIS_MODULE, | ||
409 | .name = "RadioTrack radio", | 408 | .name = "RadioTrack radio", |
410 | .type = VID_TYPE_TUNER, | 409 | .type = VID_TYPE_TUNER, |
411 | .fops = &rtrack_fops, | 410 | .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 = { | |||
369 | }; | 369 | }; |
370 | 370 | ||
371 | static struct video_device aztech_radio = { | 371 | static struct video_device aztech_radio = { |
372 | .owner = THIS_MODULE, | ||
373 | .name = "Aztech radio", | 372 | .name = "Aztech radio", |
374 | .type = VID_TYPE_TUNER, | 373 | .type = VID_TYPE_TUNER, |
375 | .fops = &aztech_fops, | 374 | .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 = { | |||
586 | }; | 586 | }; |
587 | 587 | ||
588 | static struct video_device cadet_radio = { | 588 | static struct video_device cadet_radio = { |
589 | .owner = THIS_MODULE, | ||
590 | .name = "Cadet radio", | 589 | .name = "Cadet radio", |
591 | .type = VID_TYPE_TUNER, | 590 | .type = VID_TYPE_TUNER, |
592 | .fops = &cadet_fops, | 591 | .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 = { | |||
391 | }; | 391 | }; |
392 | 392 | ||
393 | static struct video_device vdev_template = { | 393 | static struct video_device vdev_template = { |
394 | .owner = THIS_MODULE, | ||
395 | .name = "Gemtek PCI Radio", | 394 | .name = "Gemtek PCI Radio", |
396 | .type = VID_TYPE_TUNER, | 395 | .type = VID_TYPE_TUNER, |
397 | .fops = &gemtek_pci_fops, | 396 | .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 = { | |||
569 | }; | 569 | }; |
570 | 570 | ||
571 | static struct video_device gemtek_radio = { | 571 | static struct video_device gemtek_radio = { |
572 | .owner = THIS_MODULE, | ||
573 | .name = "GemTek Radio card", | 572 | .name = "GemTek Radio card", |
574 | .type = VID_TYPE_TUNER, | 573 | .type = VID_TYPE_TUNER, |
575 | .fops = &gemtek_fops, | 574 | .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 = { | |||
390 | }; | 390 | }; |
391 | 391 | ||
392 | static struct video_device maxiradio_radio = { | 392 | static struct video_device maxiradio_radio = { |
393 | .owner = THIS_MODULE, | ||
394 | .name = "Maxi Radio FM2000 radio", | 393 | .name = "Maxi Radio FM2000 radio", |
395 | .type = VID_TYPE_TUNER, | 394 | .type = VID_TYPE_TUNER, |
396 | .fops = &maxiradio_fops, | 395 | .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 = { | |||
311 | }; | 311 | }; |
312 | 312 | ||
313 | static struct video_device rtrack2_radio = { | 313 | static struct video_device rtrack2_radio = { |
314 | .owner = THIS_MODULE, | ||
315 | .name = "RadioTrack II radio", | 314 | .name = "RadioTrack II radio", |
316 | .type = VID_TYPE_TUNER, | 315 | .type = VID_TYPE_TUNER, |
317 | .fops = &rtrack2_fops, | 316 | .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 = { | |||
311 | }; | 311 | }; |
312 | 312 | ||
313 | static struct video_device fmi_radio = { | 313 | static struct video_device fmi_radio = { |
314 | .owner = THIS_MODULE, | ||
315 | .name = "SF16FMx radio", | 314 | .name = "SF16FMx radio", |
316 | .type = VID_TYPE_TUNER, | 315 | .type = VID_TYPE_TUNER, |
317 | .fops = &fmi_fops, | 316 | .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 = { | |||
427 | }; | 427 | }; |
428 | 428 | ||
429 | static struct video_device fmr2_radio = { | 429 | static struct video_device fmr2_radio = { |
430 | .owner = THIS_MODULE, | ||
431 | .name = "SF16FMR2 radio", | 430 | .name = "SF16FMR2 radio", |
432 | .type = VID_TYPE_TUNER, | 431 | .type = VID_TYPE_TUNER, |
433 | .fops = &fmr2_fops, | 432 | .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 = { | |||
1611 | .name = DRIVER_NAME, | 1611 | .name = DRIVER_NAME, |
1612 | .type = VID_TYPE_TUNER, | 1612 | .type = VID_TYPE_TUNER, |
1613 | .release = video_device_release, | 1613 | .release = video_device_release, |
1614 | .owner = THIS_MODULE, | ||
1615 | }; | 1614 | }; |
1616 | 1615 | ||
1617 | 1616 | ||
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 = { | |||
383 | }; | 383 | }; |
384 | 384 | ||
385 | static struct video_device terratec_radio = { | 385 | static struct video_device terratec_radio = { |
386 | .owner = THIS_MODULE, | ||
387 | .name = "TerraTec ActiveRadio", | 386 | .name = "TerraTec ActiveRadio", |
388 | .type = VID_TYPE_TUNER, | 387 | .type = VID_TYPE_TUNER, |
389 | .fops = &terratec_fops, | 388 | .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 = { | |||
363 | }; | 363 | }; |
364 | 364 | ||
365 | static struct video_device trust_radio = { | 365 | static struct video_device trust_radio = { |
366 | .owner = THIS_MODULE, | ||
367 | .name = "Trust FM Radio", | 366 | .name = "Trust FM Radio", |
368 | .type = VID_TYPE_TUNER, | 367 | .type = VID_TYPE_TUNER, |
369 | .fops = &trust_fops, | 368 | .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 = { | |||
361 | }; | 361 | }; |
362 | 362 | ||
363 | static struct video_device typhoon_radio = { | 363 | static struct video_device typhoon_radio = { |
364 | .owner = THIS_MODULE, | ||
365 | .name = "Typhoon Radio", | 364 | .name = "Typhoon Radio", |
366 | .type = VID_TYPE_TUNER, | 365 | .type = VID_TYPE_TUNER, |
367 | .fops = &typhoon_fops, | 366 | .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 = { | |||
424 | }; | 424 | }; |
425 | 425 | ||
426 | static struct video_device zoltrix_radio = { | 426 | static struct video_device zoltrix_radio = { |
427 | .owner = THIS_MODULE, | ||
428 | .name = "Zoltrix Radio Plus", | 427 | .name = "Zoltrix Radio Plus", |
429 | .type = VID_TYPE_TUNER, | 428 | .type = VID_TYPE_TUNER, |
430 | .fops = &zoltrix_fops, | 429 | .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 = { | |||
907 | }; | 907 | }; |
908 | static struct video_device qcam_template= | 908 | static struct video_device qcam_template= |
909 | { | 909 | { |
910 | .owner = THIS_MODULE, | ||
911 | .name = "Connectix Quickcam", | 910 | .name = "Connectix Quickcam", |
912 | .type = VID_TYPE_CAPTURE, | 911 | .type = VID_TYPE_CAPTURE, |
913 | .fops = &qcam_fops, | 912 | .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 = { | |||
702 | 702 | ||
703 | static struct video_device qcam_template= | 703 | static struct video_device qcam_template= |
704 | { | 704 | { |
705 | .owner = THIS_MODULE, | ||
706 | .name = "Colour QuickCam", | 705 | .name = "Colour QuickCam", |
707 | .type = VID_TYPE_CAPTURE, | 706 | .type = VID_TYPE_CAPTURE, |
708 | .fops = &qcam_fops, | 707 | .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 = { | |||
3799 | }; | 3799 | }; |
3800 | 3800 | ||
3801 | static struct video_device cpia_template = { | 3801 | static struct video_device cpia_template = { |
3802 | .owner = THIS_MODULE, | ||
3803 | .name = "CPiA Camera", | 3802 | .name = "CPiA Camera", |
3804 | .type = VID_TYPE_CAPTURE, | 3803 | .type = VID_TYPE_CAPTURE, |
3805 | .fops = &cpia_fops, | 3804 | .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 = { | |||
1936 | 1936 | ||
1937 | static struct video_device cpia2_template = { | 1937 | static struct video_device cpia2_template = { |
1938 | /* I could not find any place for the old .initialize initializer?? */ | 1938 | /* I could not find any place for the old .initialize initializer?? */ |
1939 | .owner= THIS_MODULE, | ||
1940 | .name= "CPiA2 Camera", | 1939 | .name= "CPiA2 Camera", |
1941 | .type= VID_TYPE_CAPTURE, | 1940 | .type= VID_TYPE_CAPTURE, |
1942 | .type2 = V4L2_CAP_VIDEO_CAPTURE | | 1941 | .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) | |||
2585 | } | 2585 | } |
2586 | 2586 | ||
2587 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); | 2587 | strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera"); |
2588 | cam->v4ldev->owner = THIS_MODULE; | ||
2589 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 2588 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
2590 | cam->v4ldev->fops = &et61x251_fops; | 2589 | cam->v4ldev->fops = &et61x251_fops; |
2591 | cam->v4ldev->minor = video_nr[dev_nr]; | 2590 | 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 = { | |||
1720 | }; | 1720 | }; |
1721 | 1721 | ||
1722 | static struct video_device meye_template = { | 1722 | static struct video_device meye_template = { |
1723 | .owner = THIS_MODULE, | ||
1724 | .name = "meye", | 1723 | .name = "meye", |
1725 | .type = VID_TYPE_CAPTURE, | 1724 | .type = VID_TYPE_CAPTURE, |
1726 | .fops = &meye_fops, | 1725 | .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 = { | |||
4666 | }; | 4666 | }; |
4667 | 4667 | ||
4668 | static struct video_device vdev_template = { | 4668 | static struct video_device vdev_template = { |
4669 | .owner = THIS_MODULE, | ||
4670 | .name = "OV511 USB Camera", | 4669 | .name = "OV511 USB Camera", |
4671 | .type = VID_TYPE_CAPTURE, | 4670 | .type = VID_TYPE_CAPTURE, |
4672 | .fops = &ov511_fops, | 4671 | .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 = { | |||
895 | 895 | ||
896 | static struct video_device pms_template= | 896 | static struct video_device pms_template= |
897 | { | 897 | { |
898 | .owner = THIS_MODULE, | ||
899 | .name = "Mediavision PMS", | 898 | .name = "Mediavision PMS", |
900 | .type = VID_TYPE_CAPTURE, | 899 | .type = VID_TYPE_CAPTURE, |
901 | .fops = &pms_fops, | 900 | .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 = { | |||
1161 | 1161 | ||
1162 | 1162 | ||
1163 | static struct video_device vdev_template = { | 1163 | static struct video_device vdev_template = { |
1164 | .owner = THIS_MODULE, | ||
1165 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, | 1164 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, |
1166 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE | 1165 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |
1167 | | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | 1166 | | 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 = { | |||
165 | .llseek = no_llseek, | 165 | .llseek = no_llseek, |
166 | }; | 166 | }; |
167 | static struct video_device pwc_template = { | 167 | static struct video_device pwc_template = { |
168 | .owner = THIS_MODULE, | ||
169 | .name = "Philips Webcam", /* Filled in later */ | 168 | .name = "Philips Webcam", /* Filled in later */ |
170 | .type = VID_TYPE_CAPTURE, | 169 | .type = VID_TYPE_CAPTURE, |
171 | .release = video_device_release, | 170 | .release = video_device_release, |
@@ -1769,7 +1768,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
1769 | memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template)); | 1768 | memcpy(pdev->vdev, &pwc_template, sizeof(pwc_template)); |
1770 | pdev->vdev->parent = &(udev->dev); | 1769 | pdev->vdev->parent = &(udev->dev); |
1771 | strcpy(pdev->vdev->name, name); | 1770 | strcpy(pdev->vdev->name, name); |
1772 | pdev->vdev->owner = THIS_MODULE; | ||
1773 | video_set_drvdata(pdev->vdev, pdev); | 1771 | video_set_drvdata(pdev->vdev, pdev); |
1774 | 1772 | ||
1775 | pdev->release = le16_to_cpu(udev->descriptor.bcdDevice); | 1773 | 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 = { | |||
830 | 830 | ||
831 | static struct video_device saa_template = | 831 | static struct video_device saa_template = |
832 | { | 832 | { |
833 | .owner = THIS_MODULE, | ||
834 | .name = IF_NAME, | 833 | .name = IF_NAME, |
835 | .type = VID_TYPE_TELETEXT, | 834 | .type = VID_TYPE_TELETEXT, |
836 | .fops = &saa_fops, | 835 | .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 = { | |||
711 | 711 | ||
712 | static struct video_device saa_template = | 712 | static struct video_device saa_template = |
713 | { | 713 | { |
714 | .owner = THIS_MODULE, | ||
715 | .name = IF_NAME, | 714 | .name = IF_NAME, |
716 | .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ | 715 | .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ |
717 | .fops = &saa_fops, | 716 | .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 = { | |||
1230 | .llseek = no_llseek, | 1230 | .llseek = no_llseek, |
1231 | }; | 1231 | }; |
1232 | static struct video_device se401_template = { | 1232 | static struct video_device se401_template = { |
1233 | .owner = THIS_MODULE, | ||
1234 | .name = "se401 USB camera", | 1233 | .name = "se401 USB camera", |
1235 | .type = VID_TYPE_CAPTURE, | 1234 | .type = VID_TYPE_CAPTURE, |
1236 | .fops = &se401_fops, | 1235 | .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) | |||
3309 | } | 3309 | } |
3310 | 3310 | ||
3311 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); | 3311 | strcpy(cam->v4ldev->name, "SN9C1xx PC Camera"); |
3312 | cam->v4ldev->owner = THIS_MODULE; | ||
3313 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 3312 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
3314 | cam->v4ldev->fops = &sn9c102_fops; | 3313 | cam->v4ldev->fops = &sn9c102_fops; |
3315 | cam->v4ldev->minor = video_nr[dev_nr]; | 3314 | 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 = { | |||
1401 | .llseek = no_llseek, | 1401 | .llseek = no_llseek, |
1402 | }; | 1402 | }; |
1403 | static struct video_device stv680_template = { | 1403 | static struct video_device stv680_template = { |
1404 | .owner = THIS_MODULE, | ||
1405 | .name = "STV0680 USB camera", | 1404 | .name = "STV0680 USB camera", |
1406 | .type = VID_TYPE_CAPTURE, | 1405 | .type = VID_TYPE_CAPTURE, |
1407 | .fops = &stv680_fops, | 1406 | .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 = { | |||
952 | .llseek = no_llseek, | 952 | .llseek = no_llseek, |
953 | }; | 953 | }; |
954 | static const struct video_device usbvideo_template = { | 954 | static const struct video_device usbvideo_template = { |
955 | .owner = THIS_MODULE, | ||
956 | .type = VID_TYPE_CAPTURE, | 955 | .type = VID_TYPE_CAPTURE, |
957 | .fops = &usbvideo_fops, | 956 | .fops = &usbvideo_fops, |
958 | }; | 957 | }; |
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 = { | |||
791 | }; | 791 | }; |
792 | 792 | ||
793 | static struct video_device vicam_template = { | 793 | static struct video_device vicam_template = { |
794 | .owner = THIS_MODULE, | ||
795 | .name = "ViCam-based USB Camera", | 794 | .name = "ViCam-based USB Camera", |
796 | .type = VID_TYPE_CAPTURE, | 795 | .type = VID_TYPE_CAPTURE, |
797 | .fops = &vicam_fops, | 796 | .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 = { | |||
1406 | }; | 1406 | }; |
1407 | 1407 | ||
1408 | static struct video_device usbvision_video_template = { | 1408 | static struct video_device usbvision_video_template = { |
1409 | .owner = THIS_MODULE, | ||
1410 | .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, | 1409 | .type = VID_TYPE_TUNER | VID_TYPE_CAPTURE, |
1411 | .fops = &usbvision_fops, | 1410 | .fops = &usbvision_fops, |
1412 | .ioctl_ops = &usbvision_ioctl_ops, | 1411 | .ioctl_ops = &usbvision_ioctl_ops, |
@@ -1445,7 +1444,6 @@ static const struct v4l2_ioctl_ops usbvision_radio_ioctl_ops = { | |||
1445 | }; | 1444 | }; |
1446 | 1445 | ||
1447 | static struct video_device usbvision_radio_template = { | 1446 | static struct video_device usbvision_radio_template = { |
1448 | .owner = THIS_MODULE, | ||
1449 | .type = VID_TYPE_TUNER, | 1447 | .type = VID_TYPE_TUNER, |
1450 | .fops = &usbvision_radio_fops, | 1448 | .fops = &usbvision_radio_fops, |
1451 | .name = "usbvision-radio", | 1449 | .name = "usbvision-radio", |
@@ -1469,7 +1467,6 @@ static const struct file_operations usbvision_vbi_fops = { | |||
1469 | 1467 | ||
1470 | static struct video_device usbvision_vbi_template= | 1468 | static struct video_device usbvision_vbi_template= |
1471 | { | 1469 | { |
1472 | .owner = THIS_MODULE, | ||
1473 | .type = VID_TYPE_TUNER, | 1470 | .type = VID_TYPE_TUNER, |
1474 | .fops = &usbvision_vbi_fops, | 1471 | .fops = &usbvision_vbi_fops, |
1475 | .release = video_device_release, | 1472 | .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 = { | |||
196 | .llseek = no_llseek, | 196 | .llseek = no_llseek, |
197 | }; | 197 | }; |
198 | static struct video_device w9966_template = { | 198 | static struct video_device w9966_template = { |
199 | .owner = THIS_MODULE, | ||
200 | .name = W9966_DRIVERNAME, | 199 | .name = W9966_DRIVERNAME, |
201 | .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, | 200 | .type = VID_TYPE_CAPTURE | VID_TYPE_SCALES, |
202 | .fops = &w9966_fops, | 201 | .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) | |||
3550 | } | 3550 | } |
3551 | 3551 | ||
3552 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); | 3552 | strcpy(cam->v4ldev->name, symbolic(camlist, mod_id)); |
3553 | cam->v4ldev->owner = THIS_MODULE; | ||
3554 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 3553 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
3555 | cam->v4ldev->fops = &w9968cf_fops; | 3554 | cam->v4ldev->fops = &w9968cf_fops; |
3556 | cam->v4ldev->minor = video_nr[dev_nr]; | 3555 | 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) | |||
1985 | } | 1985 | } |
1986 | 1986 | ||
1987 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); | 1987 | strcpy(cam->v4ldev->name, "ZC0301[P] PC Camera"); |
1988 | cam->v4ldev->owner = THIS_MODULE; | ||
1989 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; | 1988 | cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES; |
1990 | cam->v4ldev->fops = &zc0301_fops; | 1989 | cam->v4ldev->fops = &zc0301_fops; |
1991 | cam->v4ldev->minor = video_nr[dev_nr]; | 1990 | 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 = { | |||
779 | }; | 779 | }; |
780 | 780 | ||
781 | static struct video_device zr364xx_template = { | 781 | static struct video_device zr364xx_template = { |
782 | .owner = THIS_MODULE, | ||
783 | .name = DRIVER_DESC, | 782 | .name = DRIVER_DESC, |
784 | .type = VID_TYPE_CAPTURE, | 783 | .type = VID_TYPE_CAPTURE, |
785 | .fops = &zr364xx_fops, | 784 | .fops = &zr364xx_fops, |