aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-dvb.c
diff options
context:
space:
mode:
authorFilipe Rosset <rosset.filipe@gmail.com>2009-11-04 13:32:37 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:13 -0500
commit480be1851aebcb0b9c5b0fb9acefe5da97cc702a (patch)
tree5ecb6ad169e1417e4d323ee52cb16714d63b7310 /drivers/media/video/em28xx/em28xx-dvb.c
parent0bc23083cfa0e4bee3a89254c0af7dc6a16513bb (diff)
V4L/DVB (13290): em28xx-dvb: Convert printks to em28xx_err and em28xx_info
Convert printks to em28xx_err and em28xx_info Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-dvb.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 19f5156f653e..cc0505eb900f 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -313,22 +313,20 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
313 cfg.i2c_addr = addr; 313 cfg.i2c_addr = addr;
314 314
315 if (!dev->dvb->frontend) { 315 if (!dev->dvb->frontend) {
316 printk(KERN_ERR "%s/2: dvb frontend not attached. " 316 em28xx_errdev("/2: dvb frontend not attached. "
317 "Can't attach xc3028\n", 317 "Can't attach xc3028\n");
318 dev->name);
319 return -EINVAL; 318 return -EINVAL;
320 } 319 }
321 320
322 fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg); 321 fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg);
323 if (!fe) { 322 if (!fe) {
324 printk(KERN_ERR "%s/2: xc3028 attach failed\n", 323 em28xx_errdev("/2: xc3028 attach failed\n");
325 dev->name);
326 dvb_frontend_detach(dev->dvb->frontend); 324 dvb_frontend_detach(dev->dvb->frontend);
327 dev->dvb->frontend = NULL; 325 dev->dvb->frontend = NULL;
328 return -EINVAL; 326 return -EINVAL;
329 } 327 }
330 328
331 printk(KERN_INFO "%s/2: xc3028 attached\n", dev->name); 329 em28xx_info("%s/2: xc3028 attached\n", dev->name);
332 330
333 return 0; 331 return 0;
334} 332}
@@ -463,7 +461,7 @@ static int dvb_init(struct em28xx *dev)
463 dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); 461 dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);
464 462
465 if (dvb == NULL) { 463 if (dvb == NULL) {
466 printk(KERN_INFO "em28xx_dvb: memory allocation failed\n"); 464 em28xx_info("em28xx_dvb: memory allocation failed\n");
467 return -ENOMEM; 465 return -ENOMEM;
468 } 466 }
469 dev->dvb = dvb; 467 dev->dvb = dvb;
@@ -570,15 +568,12 @@ static int dvb_init(struct em28xx *dev)
570 } 568 }
571 break; 569 break;
572 default: 570 default:
573 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" 571 em28xx_errdev("/2: The frontend of your DVB/ATSC card"
574 " isn't supported yet\n", 572 " isn't supported yet\n");
575 dev->name);
576 break; 573 break;
577 } 574 }
578 if (NULL == dvb->frontend) { 575 if (NULL == dvb->frontend) {
579 printk(KERN_ERR 576 em28xx_errdev("/2: frontend initialization failed\n");
580 "%s/2: frontend initialization failed\n",
581 dev->name);
582 result = -EINVAL; 577 result = -EINVAL;
583 goto out_free; 578 goto out_free;
584 } 579 }
@@ -592,7 +587,7 @@ static int dvb_init(struct em28xx *dev)
592 goto out_free; 587 goto out_free;
593 588
594 em28xx_set_mode(dev, EM28XX_SUSPEND); 589 em28xx_set_mode(dev, EM28XX_SUSPEND);
595 printk(KERN_INFO "Successfully loaded em28xx-dvb\n"); 590 em28xx_info("Successfully loaded em28xx-dvb\n");
596 return 0; 591 return 0;
597 592
598out_free: 593out_free: