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

Commit 890024ad authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

[media] stk1160: Reduce driver verbosity 



These messages are not really informational, and just makes the driver's
output too verbose. This commit changes some messages to a debug level,
removes a really useless "driver loaded" message and finally undefines
the DEBUG macro.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f47c9045

drivers/media/usb/stk1160/stk1160-core.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -162,7 +162,7 @@ static void stk1160_release(struct v4l2_device *v4l2_dev) 
{

{

	struct stk1160 *dev = container_of(v4l2_dev, struct stk1160, v4l2_dev);

	struct stk1160 *dev = container_of(v4l2_dev, struct stk1160, v4l2_dev);





	stk1160_info("releasing all resources\n");

	stk1160_dbg("releasing all resources\n");





	stk1160_i2c_unregister(dev);

	stk1160_i2c_unregister(dev);
@@ -363,9 +363,6 @@ static int stk1160_probe(struct usb_interface *interface, 
	dev->sd_saa7115 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,

	dev->sd_saa7115 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,

		"saa7115_auto", 0, saa7113_addrs);

		"saa7115_auto", 0, saa7113_addrs);





	stk1160_info("driver ver %s successfully loaded\n",

		STK1160_VERSION);



	/* i2c reset saa711x */

	/* i2c reset saa711x */

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0);

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0);

	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);

	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);

drivers/media/usb/stk1160/stk1160-v4l.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ static bool stk1160_set_alternate(struct stk1160 *dev) 
			dev->alt = i;

			dev->alt = i;

	}

	}





	stk1160_info("setting alternate %d\n", dev->alt);

	stk1160_dbg("setting alternate %d\n", dev->alt);





	if (dev->alt != prev_alt) {

	if (dev->alt != prev_alt) {

		stk1160_dbg("minimum isoc packet size: %u (alt=%d)\n",

		stk1160_dbg("minimum isoc packet size: %u (alt=%d)\n",
@@ -226,7 +226,7 @@ static void stk1160_stop_hw(struct stk1160 *dev) 




	/* set alternate 0 */

	/* set alternate 0 */

	dev->alt = 0;

	dev->alt = 0;

	stk1160_info("setting alternate %d\n", dev->alt);

	stk1160_dbg("setting alternate %d\n", dev->alt);

	usb_set_interface(dev->udev, 0, 0);

	usb_set_interface(dev->udev, 0, 0);





	/* Stop stk1160 */

	/* Stop stk1160 */
@@ -540,7 +540,7 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *v4l_fmt, 




	sizes[0] = size;

	sizes[0] = size;





	stk1160_info("%s: buffer count %d, each %ld bytes\n",

	stk1160_dbg("%s: buffer count %d, each %ld bytes\n",

		    __func__, *nbuffers, size);

		    __func__, *nbuffers, size);





	return 0;

	return 0;
@@ -625,7 +625,7 @@ void stk1160_clear_queue(struct stk1160 *dev) 
			struct stk1160_buffer, list);

			struct stk1160_buffer, list);

		list_del(&buf->list);

		list_del(&buf->list);

		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);

		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);

		stk1160_info("buffer [%p/%d] aborted\n",

		stk1160_dbg("buffer [%p/%d] aborted\n",

			    buf, buf->vb.v4l2_buf.index);

			    buf, buf->vb.v4l2_buf.index);

	}

	}
@@ -635,7 +635,7 @@ void stk1160_clear_queue(struct stk1160 *dev) 
		dev->isoc_ctl.buf = NULL;

		dev->isoc_ctl.buf = NULL;





		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);

		vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);

		stk1160_info("buffer [%p/%d] aborted\n",

		stk1160_dbg("buffer [%p/%d] aborted\n",

			    buf, buf->vb.v4l2_buf.index);

			    buf, buf->vb.v4l2_buf.index);

	}

	}

	spin_unlock_irqrestore(&dev->buf_lock, flags);

	spin_unlock_irqrestore(&dev->buf_lock, flags);

drivers/media/usb/stk1160/stk1160.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ 
 * new drivers should use.

 * new drivers should use.

 *

 *

 */

 */

#define DEBUG

#ifdef DEBUG

#ifdef DEBUG

#define stk1160_dbg(fmt, args...) \

#define stk1160_dbg(fmt, args...) \

	printk(KERN_DEBUG "stk1160: " fmt,  ## args)

	printk(KERN_DEBUG "stk1160: " fmt,  ## args)