aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-21 06:51:45 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-26 11:55:07 -0400
commit9c39d7eafa366b807067697f7fc5b14d8b865179 (patch)
tree52442a49ab95ed1c3495a398ad6b271d6c65f1b9 /drivers/media/video
parenta399810ca69d9d4bd30ab8c1678c7439e567f90b (diff)
V4L/DVB (8483): Remove obsolete owner field from video_device struct.
According to an old comment this should have been removed in 2.6.15. Better late than never... Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/bw-qcam.c1
-rw-r--r--drivers/media/video/c-qcam.c1
-rw-r--r--drivers/media/video/cpia.c1
-rw-r--r--drivers/media/video/cpia2/cpia2_v4l.c1
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c1
-rw-r--r--drivers/media/video/meye.c1
-rw-r--r--drivers/media/video/ov511.c1
-rw-r--r--drivers/media/video/pms.c1
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c1
-rw-r--r--drivers/media/video/pwc/pwc-if.c2
-rw-r--r--drivers/media/video/saa5246a.c1
-rw-r--r--drivers/media/video/saa5249.c1
-rw-r--r--drivers/media/video/se401.c1
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c1
-rw-r--r--drivers/media/video/stv680.c1
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c1
-rw-r--r--drivers/media/video/usbvideo/vicam.c1
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c3
-rw-r--r--drivers/media/video/w9966.c1
-rw-r--r--drivers/media/video/w9968cf.c1
-rw-r--r--drivers/media/video/zc0301/zc0301_core.c1
-rw-r--r--drivers/media/video/zr364xx.c1
22 files changed, 0 insertions, 25 deletions
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};
908static struct video_device qcam_template= 908static 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
703static struct video_device qcam_template= 703static 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
3801static struct video_device cpia_template = { 3801static 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
1937static struct video_device cpia2_template = { 1937static 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
1722static struct video_device meye_template = { 1722static 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
4668static struct video_device vdev_template = { 4668static 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
896static struct video_device pms_template= 896static 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
1163static struct video_device vdev_template = { 1163static 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};
167static struct video_device pwc_template = { 167static 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
831static struct video_device saa_template = 831static 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
712static struct video_device saa_template = 712static 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};
1232static struct video_device se401_template = { 1232static 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};
1403static struct video_device stv680_template = { 1403static 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};
954static const struct video_device usbvideo_template = { 954static 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
793static struct video_device vicam_template = { 793static 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
1408static struct video_device usbvision_video_template = { 1408static 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
1447static struct video_device usbvision_radio_template = { 1446static 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
1470static struct video_device usbvision_vbi_template= 1468static 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};
198static struct video_device w9966_template = { 198static 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
781static struct video_device zr364xx_template = { 781static 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,
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 07:09:17 -0500