Commit 0885ba1d authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4245): Reduce the amount of pvrusb2-sourced noise going into the system log 



Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent b30d2441

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+1 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw) 
		return;

	}



	pvr2_trace(PVR2_TRACE_EEPROM,

	pvr2_trace(PVR2_TRACE_ERROR_LEGS,

		   "Unable to select a viable initial video standard");

}

drivers/media/video/pvrusb2/pvrusb2-main.c

+0 −8
Original line number Diff line number Diff line
@@ -46,14 +46,6 @@ 
			    PVR2_TRACE_INFO| \

			    PVR2_TRACE_TOLERANCE| \

			    PVR2_TRACE_TRAP| \

			    PVR2_TRACE_FIRMWARE| \

			    PVR2_TRACE_EEPROM | \

			    PVR2_TRACE_INIT | \

			    PVR2_TRACE_I2C | \

			    PVR2_TRACE_CHIPS | \

			    PVR2_TRACE_START_STOP | \

			    PVR2_TRACE_CTL | \

			    PVR2_TRACE_DEBUGIFC | \

			    0)



int pvrusb2_debug = DEFAULT_DEBUG_MASK;

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+5 −5
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, 
			cptr = pvr2_hdw_get_ctrl_v4l(hdw,vc->id);

		}

		if (!cptr) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			pvr2_trace(PVR2_TRACE_V4LIOCTL,

				   "QUERYCTRL id=0x%x not implemented here",

				   vc->id);

			ret = -EINVAL;
@@ -560,7 +560,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, 
			vc->step = 1;

			break;

		default:

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			pvr2_trace(PVR2_TRACE_V4LIOCTL,

				   "QUERYCTRL id=0x%x name=%s not mappable",

				   vc->id,pvr2_ctrl_get_name(cptr));

			ret = -EINVAL;
@@ -678,11 +678,11 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, 


	if (ret < 0) {

		if (pvrusb2_debug & PVR2_TRACE_V4LIOCTL) {

			pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			pvr2_trace(PVR2_TRACE_V4LIOCTL,

				   "pvr2_v4l2_do_ioctl failure, ret=%d",ret);

		} else {

			if (pvrusb2_debug & PVR2_TRACE_ERROR_LEGS) {

				pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			if (pvrusb2_debug & PVR2_TRACE_V4LIOCTL) {

				pvr2_trace(PVR2_TRACE_V4LIOCTL,

					   "pvr2_v4l2_do_ioctl failure, ret=%d"

					   " command was:",ret);

				v4l_print_ioctl(pvr2_hdw_get_driver_name(hdw),