aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2009-12-10 08:51:38 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-15 21:17:57 -0500
commit46b21094cee16bc7e531d7d6cd66fb5ea05065d4 (patch)
tree0076c71aef1f1092934a7536ab18dfccffb13907 /drivers/media/video/cx23885
parent50462eb065e12f45851a9959a90d46b758944552 (diff)
V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments
Now that the video_device registration is tested using video_is_registered(), drivers don't need to initialize the video_device::minor field to -1 anymore. Remove those unneeded assignments. [mchehab.redhat.com: removed tm6000 changes as tm6000 is not ready yet for submission even on staging] Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-417.c1
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 272c60a993b5..88c0d2481118 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1721,7 +1721,6 @@ static struct video_device cx23885_mpeg_template = {
1721 .name = "cx23885", 1721 .name = "cx23885",
1722 .fops = &mpeg_fops, 1722 .fops = &mpeg_fops,
1723 .ioctl_ops = &mpeg_ioctl_ops, 1723 .ioctl_ops = &mpeg_ioctl_ops,
1724 .minor = -1,
1725 .tvnorms = CX23885_NORMS, 1724 .tvnorms = CX23885_NORMS,
1726 .current_norm = V4L2_STD_NTSC_M, 1725 .current_norm = V4L2_STD_NTSC_M,
1727}; 1726};
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index e8ca8bb384d2..8934d61cf660 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -318,7 +318,6 @@ static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
318 if (NULL == vfd) 318 if (NULL == vfd)
319 return NULL; 319 return NULL;
320 *vfd = *template; 320 *vfd = *template;
321 vfd->minor = -1;
322 vfd->v4l2_dev = &dev->v4l2_dev; 321 vfd->v4l2_dev = &dev->v4l2_dev;
323 vfd->release = video_device_release; 322 vfd->release = video_device_release;
324 snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", 323 snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
@@ -1430,7 +1429,6 @@ static struct video_device cx23885_vbi_template;
1430static struct video_device cx23885_video_template = { 1429static struct video_device cx23885_video_template = {
1431 .name = "cx23885-video", 1430 .name = "cx23885-video",
1432 .fops = &video_fops, 1431 .fops = &video_fops,
1433 .minor = -1,
1434 .ioctl_ops = &video_ioctl_ops, 1432 .ioctl_ops = &video_ioctl_ops,
1435 .tvnorms = CX23885_NORMS, 1433 .tvnorms = CX23885_NORMS,
1436 .current_norm = V4L2_STD_NTSC_M, 1434 .current_norm = V4L2_STD_NTSC_M,