summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-06-25 19:30:47 -0500
committerMike Isely <isely@pobox.com>2006-06-25 19:30:47 -0500
commit0217d884320494197ce193e3a7be37d2aadb298b (patch)
treee76af1840b424a555a36b13e626138bbf610d4b9
parent0e26b437c63b92997afd53437183cba8f86423b3 (diff)
downloadmediapointer-dvb-s2-0217d884320494197ce193e3a7be37d2aadb298b.tar.gz
mediapointer-dvb-s2-0217d884320494197ce193e3a7be37d2aadb298b.tar.bz2
Reduce the amount of pvrusb2-sourced noise going into the system log
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-main.c8
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c10
3 files changed, 6 insertions, 14 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2f053c731..91a0ae19d 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1533,7 +1533,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");
}
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
index 245f7a36d..b81b5a62e 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -47,14 +47,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;
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 9de0ef1d9..01d8d8f4a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -542,7 +542,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;
@@ -576,7 +576,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;
@@ -694,11 +694,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),