aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-02 05:45:56 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 12:58:30 -0500
commit3b795d01c29c94bf1acd019ee6c7ba6b780406b0 (patch)
tree2ec5529c0b29043d204696ca04c9f6a445ae3d2f
parent56d8a3b06816f740d83f8c8c5dfc7774ae86c1f1 (diff)
[media] cx231xx: use dev_foo instead of printk
There are several places at cx231xx that uses printk without any special reason. Change all of them to use dev_foo(). Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-avcore.c3
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-cards.c6
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-dvb.c96
3 files changed, 55 insertions, 50 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index 9088a32db2d1..b299242a63dd 100644
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -1208,7 +1208,8 @@ int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
1208 /* This is just a casual suggestion to people adding 1208 /* This is just a casual suggestion to people adding
1209 new boards in case they use a tuner type we don't 1209 new boards in case they use a tuner type we don't
1210 currently know about */ 1210 currently know about */
1211 printk(KERN_INFO "Unknown tuner type configuring SIF"); 1211 dev_info(&dev->udev->dev,
1212 "Unknown tuner type configuring SIF");
1212 break; 1213 break;
1213 } 1214 }
1214 break; 1215 break;
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 2e8741314bce..7156344e7022 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1216,11 +1216,11 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
1216 cx231xx_add_into_devlist(dev); 1216 cx231xx_add_into_devlist(dev);
1217 1217
1218 if (dev->board.has_417) { 1218 if (dev->board.has_417) {
1219 printk(KERN_INFO "attach 417 %d\n", dev->model); 1219 dev_info(&udev->dev, "attach 417 %d\n", dev->model);
1220 if (cx231xx_417_register(dev) < 0) { 1220 if (cx231xx_417_register(dev) < 0) {
1221 printk(KERN_ERR 1221 dev_err(&udev->dev,
1222 "%s() Failed to register 417 on VID_B\n", 1222 "%s() Failed to register 417 on VID_B\n",
1223 __func__); 1223 __func__);
1224 } 1224 }
1225 } 1225 }
1226 1226
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 044ad353d09b..a0d40bda718d 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -45,11 +45,6 @@ MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
45 45
46DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 46DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
47 47
48#define dprintk(level, fmt, arg...) do { \
49if (debug >= level) \
50 printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg); \
51} while (0)
52
53#define CX231XX_DVB_NUM_BUFS 5 48#define CX231XX_DVB_NUM_BUFS 5
54#define CX231XX_DVB_MAX_PACKETSIZE 564 49#define CX231XX_DVB_MAX_PACKETSIZE 564
55#define CX231XX_DVB_MAX_PACKETS 64 50#define CX231XX_DVB_MAX_PACKETS 64
@@ -196,9 +191,11 @@ static inline void print_err_status(struct cx231xx *dev, int packet, int status)
196 break; 191 break;
197 } 192 }
198 if (packet < 0) { 193 if (packet < 0) {
199 dprintk(1, "URB status %d [%s].\n", status, errmsg); 194 dev_dbg(&dev->udev->dev,
195 "URB status %d [%s].\n", status, errmsg);
200 } else { 196 } else {
201 dprintk(1, "URB packet %d, status %d [%s].\n", 197 dev_dbg(&dev->udev->dev,
198 "URB packet %d, status %d [%s].\n",
202 packet, status, errmsg); 199 packet, status, errmsg);
203 } 200 }
204} 201}
@@ -377,20 +374,21 @@ static int attach_xc5000(u8 addr, struct cx231xx *dev)
377 cfg.i2c_addr = addr; 374 cfg.i2c_addr = addr;
378 375
379 if (!dev->dvb->frontend) { 376 if (!dev->dvb->frontend) {
380 printk(KERN_ERR "%s/2: dvb frontend not attached. " 377 dev_err(&dev->udev->dev, "%s/2: dvb frontend not attached. "
381 "Can't attach xc5000\n", dev->name); 378 "Can't attach xc5000\n", dev->name);
382 return -EINVAL; 379 return -EINVAL;
383 } 380 }
384 381
385 fe = dvb_attach(xc5000_attach, dev->dvb->frontend, &cfg); 382 fe = dvb_attach(xc5000_attach, dev->dvb->frontend, &cfg);
386 if (!fe) { 383 if (!fe) {
387 printk(KERN_ERR "%s/2: xc5000 attach failed\n", dev->name); 384 dev_err(&dev->udev->dev,
385 "%s/2: xc5000 attach failed\n", dev->name);
388 dvb_frontend_detach(dev->dvb->frontend); 386 dvb_frontend_detach(dev->dvb->frontend);
389 dev->dvb->frontend = NULL; 387 dev->dvb->frontend = NULL;
390 return -EINVAL; 388 return -EINVAL;
391 } 389 }
392 390
393 printk(KERN_INFO "%s/2: xc5000 attached\n", dev->name); 391 dev_info(&dev->udev->dev, "%s/2: xc5000 attached\n", dev->name);
394 392
395 return 0; 393 return 0;
396} 394}
@@ -462,7 +460,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
462 result = dvb_register_adapter(&dvb->adapter, dev->name, module, device, 460 result = dvb_register_adapter(&dvb->adapter, dev->name, module, device,
463 adapter_nr); 461 adapter_nr);
464 if (result < 0) { 462 if (result < 0) {
465 printk(KERN_WARNING 463 dev_warn(&dev->udev->dev,
466 "%s: dvb_register_adapter failed (errno = %d)\n", 464 "%s: dvb_register_adapter failed (errno = %d)\n",
467 dev->name, result); 465 dev->name, result);
468 goto fail_adapter; 466 goto fail_adapter;
@@ -476,7 +474,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
476 /* register frontend */ 474 /* register frontend */
477 result = dvb_register_frontend(&dvb->adapter, dvb->frontend); 475 result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
478 if (result < 0) { 476 if (result < 0) {
479 printk(KERN_WARNING 477 dev_warn(&dev->udev->dev,
480 "%s: dvb_register_frontend failed (errno = %d)\n", 478 "%s: dvb_register_frontend failed (errno = %d)\n",
481 dev->name, result); 479 dev->name, result);
482 goto fail_frontend; 480 goto fail_frontend;
@@ -494,7 +492,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
494 492
495 result = dvb_dmx_init(&dvb->demux); 493 result = dvb_dmx_init(&dvb->demux);
496 if (result < 0) { 494 if (result < 0) {
497 printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n", 495 dev_warn(&dev->udev->dev,
496 "%s: dvb_dmx_init failed (errno = %d)\n",
498 dev->name, result); 497 dev->name, result);
499 goto fail_dmx; 498 goto fail_dmx;
500 } 499 }
@@ -504,15 +503,16 @@ static int register_dvb(struct cx231xx_dvb *dvb,
504 dvb->dmxdev.capabilities = 0; 503 dvb->dmxdev.capabilities = 0;
505 result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter); 504 result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
506 if (result < 0) { 505 if (result < 0) {
507 printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n", 506 dev_warn(&dev->udev->dev,
508 dev->name, result); 507 "%s: dvb_dmxdev_init failed (errno = %d)\n",
508 dev->name, result);
509 goto fail_dmxdev; 509 goto fail_dmxdev;
510 } 510 }
511 511
512 dvb->fe_hw.source = DMX_FRONTEND_0; 512 dvb->fe_hw.source = DMX_FRONTEND_0;
513 result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw); 513 result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
514 if (result < 0) { 514 if (result < 0) {
515 printk(KERN_WARNING 515 dev_warn(&dev->udev->dev,
516 "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n", 516 "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
517 dev->name, result); 517 dev->name, result);
518 goto fail_fe_hw; 518 goto fail_fe_hw;
@@ -521,17 +521,17 @@ static int register_dvb(struct cx231xx_dvb *dvb,
521 dvb->fe_mem.source = DMX_MEMORY_FE; 521 dvb->fe_mem.source = DMX_MEMORY_FE;
522 result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem); 522 result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
523 if (result < 0) { 523 if (result < 0) {
524 printk(KERN_WARNING 524 dev_warn(&dev->udev->dev,
525 "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n", 525 "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
526 dev->name, result); 526 dev->name, result);
527 goto fail_fe_mem; 527 goto fail_fe_mem;
528 } 528 }
529 529
530 result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw); 530 result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
531 if (result < 0) { 531 if (result < 0) {
532 printk(KERN_WARNING 532 dev_warn(&dev->udev->dev,
533 "%s: connect_frontend failed (errno = %d)\n", dev->name, 533 "%s: connect_frontend failed (errno = %d)\n",
534 result); 534 dev->name, result);
535 goto fail_fe_conn; 535 goto fail_fe_conn;
536 } 536 }
537 537
@@ -590,7 +590,8 @@ static int dvb_init(struct cx231xx *dev)
590 dvb = kzalloc(sizeof(struct cx231xx_dvb), GFP_KERNEL); 590 dvb = kzalloc(sizeof(struct cx231xx_dvb), GFP_KERNEL);
591 591
592 if (dvb == NULL) { 592 if (dvb == NULL) {
593 printk(KERN_INFO "cx231xx_dvb: memory allocation failed\n"); 593 dev_info(&dev->udev->dev,
594 "cx231xx_dvb: memory allocation failed\n");
594 return -ENOMEM; 595 return -ENOMEM;
595 } 596 }
596 dev->dvb = dvb; 597 dev->dvb = dvb;
@@ -612,8 +613,8 @@ static int dvb_init(struct cx231xx *dev)
612 demod_i2c); 613 demod_i2c);
613 614
614 if (dev->dvb->frontend == NULL) { 615 if (dev->dvb->frontend == NULL) {
615 printk(DRIVER_NAME 616 dev_err(&dev->udev->dev,
616 ": Failed to attach s5h1432 front end\n"); 617 "Failed to attach s5h1432 front end\n");
617 result = -EINVAL; 618 result = -EINVAL;
618 goto out_free; 619 goto out_free;
619 } 620 }
@@ -637,8 +638,8 @@ static int dvb_init(struct cx231xx *dev)
637 demod_i2c); 638 demod_i2c);
638 639
639 if (dev->dvb->frontend == NULL) { 640 if (dev->dvb->frontend == NULL) {
640 printk(DRIVER_NAME 641 dev_err(&dev->udev->dev,
641 ": Failed to attach s5h1411 front end\n"); 642 "Failed to attach s5h1411 front end\n");
642 result = -EINVAL; 643 result = -EINVAL;
643 goto out_free; 644 goto out_free;
644 } 645 }
@@ -660,8 +661,8 @@ static int dvb_init(struct cx231xx *dev)
660 demod_i2c); 661 demod_i2c);
661 662
662 if (dev->dvb->frontend == NULL) { 663 if (dev->dvb->frontend == NULL) {
663 printk(DRIVER_NAME 664 dev_err(&dev->udev->dev,
664 ": Failed to attach s5h1432 front end\n"); 665 "Failed to attach s5h1432 front end\n");
665 result = -EINVAL; 666 result = -EINVAL;
666 goto out_free; 667 goto out_free;
667 } 668 }
@@ -684,8 +685,8 @@ static int dvb_init(struct cx231xx *dev)
684 demod_i2c); 685 demod_i2c);
685 686
686 if (dev->dvb->frontend == NULL) { 687 if (dev->dvb->frontend == NULL) {
687 printk(DRIVER_NAME 688 dev_err(&dev->udev->dev,
688 ": Failed to attach s5h1411 front end\n"); 689 "Failed to attach s5h1411 front end\n");
689 result = -EINVAL; 690 result = -EINVAL;
690 goto out_free; 691 goto out_free;
691 } 692 }
@@ -702,7 +703,8 @@ static int dvb_init(struct cx231xx *dev)
702 break; 703 break;
703 case CX231XX_BOARD_HAUPPAUGE_EXETER: 704 case CX231XX_BOARD_HAUPPAUGE_EXETER:
704 705
705 printk(KERN_INFO "%s: looking for tuner / demod on i2c bus: %d\n", 706 dev_info(&dev->udev->dev,
707 "%s: looking for tuner / demod on i2c bus: %d\n",
706 __func__, i2c_adapter_id(tuner_i2c)); 708 __func__, i2c_adapter_id(tuner_i2c));
707 709
708 dev->dvb->frontend = dvb_attach(lgdt3305_attach, 710 dev->dvb->frontend = dvb_attach(lgdt3305_attach,
@@ -710,8 +712,8 @@ static int dvb_init(struct cx231xx *dev)
710 tuner_i2c); 712 tuner_i2c);
711 713
712 if (dev->dvb->frontend == NULL) { 714 if (dev->dvb->frontend == NULL) {
713 printk(DRIVER_NAME 715 dev_err(&dev->udev->dev,
714 ": Failed to attach LG3305 front end\n"); 716 "Failed to attach LG3305 front end\n");
715 result = -EINVAL; 717 result = -EINVAL;
716 goto out_free; 718 goto out_free;
717 } 719 }
@@ -732,8 +734,8 @@ static int dvb_init(struct cx231xx *dev)
732 ); 734 );
733 735
734 if (dev->dvb->frontend == NULL) { 736 if (dev->dvb->frontend == NULL) {
735 printk(DRIVER_NAME 737 dev_err(&dev->udev->dev,
736 ": Failed to attach SI2165 front end\n"); 738 "Failed to attach SI2165 front end\n");
737 result = -EINVAL; 739 result = -EINVAL;
738 goto out_free; 740 goto out_free;
739 } 741 }
@@ -765,8 +767,8 @@ static int dvb_init(struct cx231xx *dev)
765 ); 767 );
766 768
767 if (dev->dvb->frontend == NULL) { 769 if (dev->dvb->frontend == NULL) {
768 printk(DRIVER_NAME 770 dev_err(&dev->udev->dev,
769 ": Failed to attach SI2165 front end\n"); 771 "Failed to attach SI2165 front end\n");
770 result = -EINVAL; 772 result = -EINVAL;
771 goto out_free; 773 goto out_free;
772 } 774 }
@@ -810,16 +812,17 @@ static int dvb_init(struct cx231xx *dev)
810 case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID: 812 case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
811 case CX231XX_BOARD_KWORLD_UB430_USB_HYBRID: 813 case CX231XX_BOARD_KWORLD_UB430_USB_HYBRID:
812 814
813 printk(KERN_INFO "%s: looking for demod on i2c bus: %d\n", 815 dev_info(&dev->udev->dev,
814 __func__, i2c_adapter_id(tuner_i2c)); 816 "%s: looking for demod on i2c bus: %d\n",
817 __func__, i2c_adapter_id(tuner_i2c));
815 818
816 dev->dvb->frontend = dvb_attach(mb86a20s_attach, 819 dev->dvb->frontend = dvb_attach(mb86a20s_attach,
817 &pv_mb86a20s_config, 820 &pv_mb86a20s_config,
818 demod_i2c); 821 demod_i2c);
819 822
820 if (dev->dvb->frontend == NULL) { 823 if (dev->dvb->frontend == NULL) {
821 printk(DRIVER_NAME 824 dev_err(&dev->udev->dev,
822 ": Failed to attach mb86a20s demod\n"); 825 "Failed to attach mb86a20s demod\n");
823 result = -EINVAL; 826 result = -EINVAL;
824 goto out_free; 827 goto out_free;
825 } 828 }
@@ -833,12 +836,13 @@ static int dvb_init(struct cx231xx *dev)
833 break; 836 break;
834 837
835 default: 838 default:
836 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" 839 dev_err(&dev->udev->dev,
837 " isn't supported yet\n", dev->name); 840 "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
841 dev->name);
838 break; 842 break;
839 } 843 }
840 if (NULL == dvb->frontend) { 844 if (NULL == dvb->frontend) {
841 printk(KERN_ERR 845 dev_err(&dev->udev->dev,
842 "%s/2: frontend initialization failed\n", dev->name); 846 "%s/2: frontend initialization failed\n", dev->name);
843 result = -EINVAL; 847 result = -EINVAL;
844 goto out_free; 848 goto out_free;
@@ -851,7 +855,7 @@ static int dvb_init(struct cx231xx *dev)
851 goto out_free; 855 goto out_free;
852 856
853 857
854 printk(KERN_INFO "Successfully loaded cx231xx-dvb\n"); 858 dev_info(&dev->udev->dev, "Successfully loaded cx231xx-dvb\n");
855 859
856ret: 860ret:
857 cx231xx_set_mode(dev, CX231XX_SUSPEND); 861 cx231xx_set_mode(dev, CX231XX_SUSPEND);
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-24 00:51:51 -0400