V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)
Use the new video_drvdata(filp) function where it is safe to do so. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
bfa8a273bb
commit
c170ecf434
@@ -204,8 +204,7 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *v)
|
||||
{
|
||||
struct video_device *dev = video_devdata(file);
|
||||
struct gemtek_pci_card *card = video_get_drvdata(dev);
|
||||
struct gemtek_pci_card *card = video_drvdata(file);
|
||||
|
||||
if (v->index > 0)
|
||||
return -EINVAL;
|
||||
@@ -232,8 +231,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
|
||||
static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct video_device *dev = video_devdata(file);
|
||||
struct gemtek_pci_card *card = video_get_drvdata(dev);
|
||||
struct gemtek_pci_card *card = video_drvdata(file);
|
||||
|
||||
if ( (f->frequency < GEMTEK_PCI_RANGE_LOW) ||
|
||||
(f->frequency > GEMTEK_PCI_RANGE_HIGH) )
|
||||
@@ -247,8 +245,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
static int vidioc_g_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct video_device *dev = video_devdata(file);
|
||||
struct gemtek_pci_card *card = video_get_drvdata(dev);
|
||||
struct gemtek_pci_card *card = video_drvdata(file);
|
||||
|
||||
f->type = V4L2_TUNER_RADIO;
|
||||
f->frequency = card->current_frequency;
|
||||
@@ -272,8 +269,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct video_device *dev = video_devdata(file);
|
||||
struct gemtek_pci_card *card = video_get_drvdata(dev);
|
||||
struct gemtek_pci_card *card = video_drvdata(file);
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
@@ -292,8 +288,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct video_device *dev = video_devdata(file);
|
||||
struct gemtek_pci_card *card = video_get_drvdata(dev);
|
||||
struct gemtek_pci_card *card = video_drvdata(file);
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
|
Reference in New Issue
Block a user