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

Commit 21a7e059 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] media: drivers shouldn't touch debug field in video_device 



The debug field in struct video_device is for internal use only and
drivers should mix that with their own debug module options.

It is handled by the V4L2 core and users can set it using
/sys/class/video4linux/<devX>/debug.

It has been deprecated for some time now, so it is time to remove it
completely from the drivers.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e476f4e1

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

+0 −1
Original line number Diff line number Diff line
@@ -3884,7 +3884,6 @@ static struct video_device *vdev_init(struct bttv *btv, 
	*vfd = *template;

	vfd->v4l2_dev = &btv->c.v4l2_dev;

	vfd->release = video_device_release;

	vfd->debug   = bttv_debug;

	video_set_drvdata(vfd, btv);

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

		 btv->id, (btv->id==848 && btv->revision==0x12) ? "A" : "",

drivers/media/pci/cx88/cx88-blackbird.c

+0 −3
Original line number Diff line number Diff line
@@ -1234,6 +1234,3 @@ static void __exit blackbird_fini(void) 


module_init(blackbird_init);

module_exit(blackbird_fini);
 


module_param_named(video_debug,cx8802_mpeg_template.debug, int, 0644);

MODULE_PARM_DESC(debug,"enable debug messages [video]");

drivers/media/platform/marvell-ccic/mcam-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1913,7 +1913,6 @@ int mccic_register(struct mcam_camera *cam) 


	mutex_lock(&cam->s_mutex);

	cam->vdev = mcam_v4l_template;

	cam->vdev.debug = 0;

	cam->vdev.v4l2_dev = &cam->v4l2_dev;

	video_set_drvdata(&cam->vdev, cam);

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

drivers/media/usb/cx231xx/cx231xx-video.c

+0 −1
Original line number Diff line number Diff line
@@ -2062,7 +2062,6 @@ static struct video_device *cx231xx_vdev_init(struct cx231xx *dev, 
	*vfd = *template;

	vfd->v4l2_dev = &dev->v4l2_dev;

	vfd->release = video_device_release;

	vfd->debug = video_debug;

	vfd->lock = &dev->lock;



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

drivers/media/usb/em28xx/em28xx-video.c

+0 −1
Original line number Diff line number Diff line
@@ -2192,7 +2192,6 @@ static struct video_device 


	*vfd		= *template;

	vfd->v4l2_dev	= &dev->v4l2->v4l2_dev;

	vfd->debug	= video_debug;

	vfd->lock	= &dev->lock;

	if (dev->board.is_webcam)

		vfd->tvnorms = 0;