mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Hans Verkuil 2008-07-21 07:51:45 -03:00 committed by Mauro Carvalho Chehab
parent a399810ca6
commit 9c39d7eafa
39 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/radio/dsbr100.c
View File

@ -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,

1
drivers/media/radio/miropcm20-radio.c
View File

@ -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,

1
drivers/media/radio/radio-aimslab.c
View File

@ -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,

1
drivers/media/radio/radio-aztech.c
View File

@ -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,

1
drivers/media/radio/radio-cadet.c
View File

@ -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,

1
drivers/media/radio/radio-gemtek-pci.c
View File

@ -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,

1
drivers/media/radio/radio-gemtek.c
View File

@ -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,

1
drivers/media/radio/radio-maxiradio.c
View File

@ -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,

1
drivers/media/radio/radio-rtrack2.c
View File

@ -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,

1
drivers/media/radio/radio-sf16fmi.c
View File

@ -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,

1
drivers/media/radio/radio-sf16fmr2.c
View File

@ -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,

1
drivers/media/radio/radio-si470x.c
View File

@ -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,
};

1
drivers/media/radio/radio-terratec.c
View File

@ -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,

1
drivers/media/radio/radio-trust.c
View File

@ -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,

1
drivers/media/radio/radio-typhoon.c
View File

@ -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,

1
drivers/media/radio/radio-zoltrix.c
View File

@ -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,

1
drivers/media/video/bw-qcam.c
View File

@ -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,

1
drivers/media/video/c-qcam.c
View File

@ -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,

1
drivers/media/video/cpia.c
View File

@ -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,

1
drivers/media/video/cpia2/cpia2_v4l.c
View File

@ -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 |

1
drivers/media/video/et61x251/et61x251_core.c
View File

@ -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];

1
drivers/media/video/meye.c
View File

@ -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,

1
drivers/media/video/ov511.c
View File

@ -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,

1
drivers/media/video/pms.c
View File

@ -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,

1
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
View File

@ -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

2
drivers/media/video/pwc/pwc-if.c
View File

@ -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);

1
drivers/media/video/saa5246a.c
View File

@ -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,

1
drivers/media/video/saa5249.c
View File

@ -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,

1
drivers/media/video/se401.c
View File

@ -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,

1
drivers/media/video/sn9c102/sn9c102_core.c
View File

@ -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];

1
drivers/media/video/stv680.c
View File

@ -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,

1
drivers/media/video/usbvideo/usbvideo.c
View File

@ -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,
};

1
drivers/media/video/usbvideo/vicam.c
View File

@ -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,

3
drivers/media/video/usbvision/usbvision-video.c
View File

@ -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,

1
drivers/media/video/w9966.c
View File

@ -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,

1
drivers/media/video/w9968cf.c
View File

@ -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];

1
drivers/media/video/zc0301/zc0301_core.c
View File

@ -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];

1
drivers/media/video/zr364xx.c
View File

@ -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,

20
include/media/v4l2-dev.h
View File

@ -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);