aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-07-08 16:20:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:17:20 -0400
commitd5a1754d523f5145a6e4ec8fa3a592cc57400467 (patch)
tree9b458650b2fdd5ded0370508fb9b84c7983f750b /drivers/media
parente3e0aaaafae24658f3d8683c65bc6793adbdfeb8 (diff)
[media] cx231xx: reduce log severity for some debug events
Change the log level from info to debug for some log events that occur frequently and should never need to be seen in normal operation. Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-core.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index 44f3c3e5e105..7beb201141c4 100644
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -528,7 +528,7 @@ int cx231xx_set_video_alternate(struct cx231xx *dev)
528 if (dev->USE_ISO == 0) 528 if (dev->USE_ISO == 0)
529 dev->video_mode.alt = 0; 529 dev->video_mode.alt = 0;
530 530
531 cx231xx_info("dev->video_mode.alt= %d\n", dev->video_mode.alt); 531 cx231xx_coredbg("dev->video_mode.alt= %d\n", dev->video_mode.alt);
532 532
533 /* Get the correct video interface Index */ 533 /* Get the correct video interface Index */
534 usb_interface_index = 534 usb_interface_index =
@@ -545,10 +545,6 @@ int cx231xx_set_video_alternate(struct cx231xx *dev)
545 cx231xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n", 545 cx231xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
546 dev->video_mode.alt, 546 dev->video_mode.alt,
547 dev->video_mode.max_pkt_size); 547 dev->video_mode.max_pkt_size);
548 cx231xx_info
549 (" setting alt %d with wMaxPktSize=%u , Interface = %d\n",
550 dev->video_mode.alt, dev->video_mode.max_pkt_size,
551 usb_interface_index);
552 errCode = 548 errCode =
553 usb_set_interface(dev->udev, usb_interface_index, 549 usb_set_interface(dev->udev, usb_interface_index,
554 dev->video_mode.alt); 550 dev->video_mode.alt);
@@ -636,9 +632,9 @@ int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt)
636 return -1; 632 return -1;
637 } 633 }
638 634
639 cx231xx_info 635 cx231xx_coredbg("setting alternate %d with wMaxPacketSize=%u,"
640 (" setting alternate %d with wMaxPacketSize=%u , Interface = %d\n", 636 "Interface = %d\n", alt, max_pkt_size,
641 alt, max_pkt_size, usb_interface_index); 637 usb_interface_index);
642 638
643 if (usb_interface_index > 0) { 639 if (usb_interface_index > 0) {
644 status = usb_set_interface(dev->udev, usb_interface_index, alt); 640 status = usb_set_interface(dev->udev, usb_interface_index, alt);
@@ -683,10 +679,12 @@ int cx231xx_demod_reset(struct cx231xx *dev)
683 679
684 status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, 680 status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,
685 value, 4); 681 value, 4);
686 cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0],
687 value[1], value[2], value[3]);
688 682
689 cx231xx_info("Enter cx231xx_demod_reset()\n"); 683 cx231xx_coredbg("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN,
684 value[0], value[1], value[2], value[3]);
685
686 cx231xx_coredbg("Enter cx231xx_demod_reset()\n");
687
690 value[1] = (u8) 0x3; 688 value[1] = (u8) 0x3;
691 status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER, 689 status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
692 PWR_CTL_EN, value, 4); 690 PWR_CTL_EN, value, 4);
@@ -706,8 +704,9 @@ int cx231xx_demod_reset(struct cx231xx *dev)
706 704
707 status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, 705 status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,
708 value, 4); 706 value, 4);
709 cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0], 707
710 value[1], value[2], value[3]); 708 cx231xx_coredbg("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN,
709 value[0], value[1], value[2], value[3]);
711 710
712 return status; 711 return status;
713} 712}
@@ -1005,7 +1004,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
1005 1004
1006 dev->video_input = dev->video_input > 2 ? 2 : dev->video_input; 1005 dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
1007 1006
1008 cx231xx_info("Setting Video mux to %d\n", dev->video_input); 1007 cx231xx_coredbg("Setting Video mux to %d\n", dev->video_input);
1008
1009 video_mux(dev, dev->video_input); 1009 video_mux(dev, dev->video_input);
1010 1010
1011 /* De-allocates all pending stuff */ 1011 /* De-allocates all pending stuff */
@@ -1146,7 +1146,8 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
1146 1146
1147 dev->video_input = dev->video_input > 2 ? 2 : dev->video_input; 1147 dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
1148 1148
1149 cx231xx_info("Setting Video mux to %d\n", dev->video_input); 1149 cx231xx_coredbg("Setting Video mux to %d\n", dev->video_input);
1150
1150 video_mux(dev, dev->video_input); 1151 video_mux(dev, dev->video_input);
1151 1152
1152 /* De-allocates all pending stuff */ 1153 /* De-allocates all pending stuff */