aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Maraschini <xrmarsx@gmail.com>2010-04-20 13:22:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:58:36 -0400
commit7ded150f573d0ce26ac96fd4c214eee7984ad339 (patch)
tree97701fa9e1ab97eafe8bb53f2ff2d7237eda6c57
parentbde4301d9a647a3b2efb1a9f429c1d3ede075fa4 (diff)
V4L/DVB: cx25821-video-upstream.c: Added severity to printk calls
Signed-off-by: Ricardo Maraschini <ricardo.maraschini@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/cx25821/cx25821-video-upstream.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
index a6eeb9aad29f..c842d8f3d692 100644
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -258,7 +258,7 @@ void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev)
258 258
259 if (!dev->_is_running) { 259 if (!dev->_is_running) {
260 printk 260 printk
261 ("cx25821: No video file is currently running so return!\n"); 261 (KERN_INFO "cx25821: No video file is currently running so return!\n");
262 return; 262 return;
263 } 263 }
264 /* Disable RISC interrupts */ 264 /* Disable RISC interrupts */
@@ -346,19 +346,19 @@ int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)
346 346
347 if (IS_ERR(myfile)) { 347 if (IS_ERR(myfile)) {
348 const int open_errno = -PTR_ERR(myfile); 348 const int open_errno = -PTR_ERR(myfile);
349 printk("%s(): ERROR opening file(%s) with errno = %d!\n", 349 printk(KERN_ERR "%s(): ERROR opening file(%s) with errno = %d!\n",
350 __func__, dev->_filename, open_errno); 350 __func__, dev->_filename, open_errno);
351 return PTR_ERR(myfile); 351 return PTR_ERR(myfile);
352 } else { 352 } else {
353 if (!(myfile->f_op)) { 353 if (!(myfile->f_op)) {
354 printk("%s: File has no file operations registered!", 354 printk(KERN_ERR "%s: File has no file operations registered!",
355 __func__); 355 __func__);
356 filp_close(myfile, NULL); 356 filp_close(myfile, NULL);
357 return -EIO; 357 return -EIO;
358 } 358 }
359 359
360 if (!myfile->f_op->read) { 360 if (!myfile->f_op->read) {
361 printk("%s: File has no READ operations registered!", 361 printk(KERN_ERR "%s: File has no READ operations registered!",
362 __func__); 362 __func__);
363 filp_close(myfile, NULL); 363 filp_close(myfile, NULL);
364 return -EIO; 364 return -EIO;
@@ -411,7 +411,7 @@ static void cx25821_vidups_handler(struct work_struct *work)
411 container_of(work, struct cx25821_dev, _irq_work_entry); 411 container_of(work, struct cx25821_dev, _irq_work_entry);
412 412
413 if (!dev) { 413 if (!dev) {
414 printk("ERROR %s(): since container_of(work_struct) FAILED!\n", 414 printk(KERN_ERR "ERROR %s(): since container_of(work_struct) FAILED!\n",
415 __func__); 415 __func__);
416 return; 416 return;
417 } 417 }
@@ -437,12 +437,12 @@ int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)
437 437
438 if (IS_ERR(myfile)) { 438 if (IS_ERR(myfile)) {
439 const int open_errno = -PTR_ERR(myfile); 439 const int open_errno = -PTR_ERR(myfile);
440 printk("%s(): ERROR opening file(%s) with errno = %d!\n", 440 printk(KERN_ERR "%s(): ERROR opening file(%s) with errno = %d!\n",
441 __func__, dev->_filename, open_errno); 441 __func__, dev->_filename, open_errno);
442 return PTR_ERR(myfile); 442 return PTR_ERR(myfile);
443 } else { 443 } else {
444 if (!(myfile->f_op)) { 444 if (!(myfile->f_op)) {
445 printk("%s: File has no file operations registered!", 445 printk(KERN_ERR "%s: File has no file operations registered!",
446 __func__); 446 __func__);
447 filp_close(myfile, NULL); 447 filp_close(myfile, NULL);
448 return -EIO; 448 return -EIO;
@@ -450,7 +450,7 @@ int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)
450 450
451 if (!myfile->f_op->read) { 451 if (!myfile->f_op->read) {
452 printk 452 printk
453 ("%s: File has no READ operations registered! Returning.", 453 (KERN_ERR "%s: File has no READ operations registered! Returning.",
454 __func__); 454 __func__);
455 filp_close(myfile, NULL); 455 filp_close(myfile, NULL);
456 return -EIO; 456 return -EIO;
@@ -526,7 +526,7 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,
526 526
527 if (!dev->_dma_virt_addr) { 527 if (!dev->_dma_virt_addr) {
528 printk 528 printk
529 ("cx25821: FAILED to allocate memory for Risc buffer! Returning.\n"); 529 (KERN_ERR "cx25821: FAILED to allocate memory for Risc buffer! Returning.\n");
530 return -ENOMEM; 530 return -ENOMEM;
531 } 531 }
532 532
@@ -547,7 +547,7 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,
547 547
548 if (!dev->_data_buf_virt_addr) { 548 if (!dev->_data_buf_virt_addr) {
549 printk 549 printk
550 ("cx25821: FAILED to allocate memory for data buffer! Returning.\n"); 550 (KERN_ERR "cx25821: FAILED to allocate memory for data buffer! Returning.\n");
551 return -ENOMEM; 551 return -ENOMEM;
552 } 552 }
553 553
@@ -642,20 +642,20 @@ int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,
642 } else { 642 } else {
643 if (status & FLD_VID_SRC_UF) 643 if (status & FLD_VID_SRC_UF)
644 printk 644 printk
645 ("%s: Video Received Underflow Error Interrupt!\n", 645 (KERN_ERR "%s: Video Received Underflow Error Interrupt!\n",
646 __func__); 646 __func__);
647 647
648 if (status & FLD_VID_SRC_SYNC) 648 if (status & FLD_VID_SRC_SYNC)
649 printk("%s: Video Received Sync Error Interrupt!\n", 649 printk(KERN_ERR "%s: Video Received Sync Error Interrupt!\n",
650 __func__); 650 __func__);
651 651
652 if (status & FLD_VID_SRC_OPC_ERR) 652 if (status & FLD_VID_SRC_OPC_ERR)
653 printk("%s: Video Received OpCode Error Interrupt!\n", 653 printk(KERN_ERR "%s: Video Received OpCode Error Interrupt!\n",
654 __func__); 654 __func__);
655 } 655 }
656 656
657 if (dev->_file_status == END_OF_FILE) { 657 if (dev->_file_status == END_OF_FILE) {
658 printk("cx25821: EOF Channel 1 Framecount = %d\n", 658 printk(KERN_ERR "cx25821: EOF Channel 1 Framecount = %d\n",
659 dev->_frame_count); 659 dev->_frame_count);
660 return -1; 660 return -1;
661 } 661 }
@@ -795,7 +795,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
795 int str_length = 0; 795 int str_length = 0;
796 796
797 if (dev->_is_running) { 797 if (dev->_is_running) {
798 printk("Video Channel is still running so return!\n"); 798 printk(KERN_INFO "Video Channel is still running so return!\n");
799 return 0; 799 return 0;
800 } 800 }
801 801
@@ -807,7 +807,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
807 807
808 if (!dev->_irq_queues) { 808 if (!dev->_irq_queues) {
809 printk 809 printk
810 ("cx25821: create_singlethread_workqueue() for Video FAILED!\n"); 810 (KERN_ERR "cx25821: create_singlethread_workqueue() for Video FAILED!\n");
811 return -ENOMEM; 811 return -ENOMEM;
812 } 812 }
813 /* 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for 813 /* 656/VIP SRC Upstream Channel I & J and 7 - Host Bus Interface for