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

Commit 46b21094 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 50462eb0

drivers/media/video/arv.c

+0 −1
Original line number Diff line number Diff line
@@ -767,7 +767,6 @@ static struct video_device ar_template = { 
	.name		= "Colour AR VGA",

	.fops		= &ar_fops,

	.release	= ar_release,

	.minor		= -1,

};



#define ALIGN4(x)	((((int)(x)) & 0x3) == 0)

drivers/media/video/au0828/au0828-video.c

+0 −1
Original line number Diff line number Diff line
@@ -1570,7 +1570,6 @@ static const struct video_device au0828_video_template = { 
	.fops                       = &au0828_v4l_fops,

	.release                    = video_device_release,

	.ioctl_ops 		    = &video_ioctl_ops,

	.minor                      = -1,

	.tvnorms                    = V4L2_STD_NTSC_M,

	.current_norm               = V4L2_STD_NTSC_M,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -3398,7 +3398,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = { 


static struct video_device bttv_video_template = {

	.fops         = &bttv_fops,

	.minor        = -1,

	.ioctl_ops    = &bttv_ioctl_ops,

	.tvnorms      = BTTV_NORMS,

	.current_norm = V4L2_STD_PAL,
@@ -3642,7 +3641,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { 


static struct video_device radio_template = {

	.fops      = &radio_fops,

	.minor     = -1,

	.ioctl_ops = &radio_ioctl_ops,

};

drivers/media/video/cafe_ccic.c

+0 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,6 @@ static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = { 


static struct video_device cafe_v4l_template = {

	.name = "cafe",

	.minor = -1, /* Get one dynamically */

	.tvnorms = V4L2_STD_NTSC_M,

	.current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */

drivers/media/video/cpia2/cpia2_v4l.c

+0 −1
Original line number Diff line number Diff line
@@ -1926,7 +1926,6 @@ static const struct v4l2_file_operations fops_template = { 
static struct video_device cpia2_template = {

	/* I could not find any place for the old .initialize initializer?? */

	.name=		"CPiA2 Camera",

	.minor=		-1,

	.fops=		&fops_template,

	.release=	video_device_release,

};