Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e85e732 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8428): videodev: rename 'dev' to 'parent' 



The field 'dev' is not the video device, but the parent of the video device.
Rename accordingly.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 27a5e6d3

drivers/media/video/bt8xx/bttv-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static ssize_t show_card(struct device *cd, 
			 struct device_attribute *attr, char *buf)

{

	struct video_device *vfd = container_of(cd, struct video_device, class_dev);

	struct bttv *btv = dev_get_drvdata(vfd->dev);

	struct bttv *btv = dev_get_drvdata(vfd->parent);

	return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET);

}

static DEVICE_ATTR(card, S_IRUGO, show_card, NULL);
@@ -4185,7 +4185,7 @@ static struct video_device *vdev_init(struct bttv *btv, 
		return NULL;

	*vfd = *template;

	vfd->minor   = -1;

	vfd->dev     = &btv->c.pci->dev;

	vfd->parent  = &btv->c.pci->dev;

	vfd->release = video_device_release;

	vfd->type    = type;

	vfd->debug   = bttv_debug;

drivers/media/video/cafe_ccic.c

+1 −1
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, 
	cam->v4ldev = cafe_v4l_template;

	cam->v4ldev.debug = 0;

//	cam->v4ldev.debug = V4L2_DEBUG_IOCTL_ARG;

	cam->v4ldev.dev = &pdev->dev;

	cam->v4ldev.parent = &pdev->dev;

	ret = video_register_device(&cam->v4ldev, VFL_TYPE_GRABBER, -1);

	if (ret)

		goto out_smbus;

drivers/media/video/cx18/cx18-streams.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type) 
			cx->num);



	s->v4l2dev->minor = minor;

	s->v4l2dev->dev = &cx->dev->dev;

	s->v4l2dev->parent = &cx->dev->dev;

	s->v4l2dev->fops = cx18_stream_info[type].fops;

	s->v4l2dev->release = video_device_release;

	s->v4l2dev->tvnorms = V4L2_STD_ALL;

drivers/media/video/cx23885/cx23885-417.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ static struct video_device *cx23885_video_dev_alloc( 
	vfd->minor   = -1;

	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name,

		type, cx23885_boards[tsport->dev->board].name);

	vfd->dev     = &pci->dev;

	vfd->parent  = &pci->dev;

	vfd->release = video_device_release;

	return vfd;

}

drivers/media/video/cx23885/cx23885-video.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev, 
		return NULL;

	*vfd = *template;

	vfd->minor   = -1;

	vfd->dev     = &pci->dev;

	vfd->parent  = &pci->dev;

	vfd->release = video_device_release;

	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",

		 dev->name, type, cx23885_boards[dev->board].name);