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>
这个提交包含在:
@@ -231,8 +231,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 radio_device *card = video_get_drvdata(dev);
|
||||
struct radio_device *card = video_drvdata(file);
|
||||
|
||||
if (v->index > 0)
|
||||
return -EINVAL;
|
||||
@@ -302,8 +301,7 @@ static int vidioc_s_audio (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 radio_device *card = video_get_drvdata(dev);
|
||||
struct radio_device *card = video_drvdata(file);
|
||||
|
||||
if (f->frequency < FREQ_LO || f->frequency > FREQ_HI) {
|
||||
dprintk(1, "radio freq (%d.%02d MHz) out of range (%d-%d)\n",
|
||||
@@ -324,8 +322,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 radio_device *card = video_get_drvdata(dev);
|
||||
struct radio_device *card = video_drvdata(file);
|
||||
|
||||
f->type = V4L2_TUNER_RADIO;
|
||||
f->frequency = card->freq;
|
||||
@@ -355,8 +352,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 radio_device *card = video_get_drvdata(dev);
|
||||
struct radio_device *card = video_drvdata(file);
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
@@ -370,8 +366,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 radio_device *card = video_get_drvdata(dev);
|
||||
struct radio_device *card = video_drvdata(file);
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_AUDIO_MUTE:
|
||||
|
在新工单中引用
屏蔽一个用户