Skip to content

Commit

Permalink
V4L/DVB (13290): em28xx-dvb: Convert printks to em28xx_err and em28xx…
Browse files Browse the repository at this point in the history
…_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>
  • Loading branch information
Filipe Rosset authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent 0bc2308 commit 480be18
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions drivers/media/video/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,22 +313,20 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
cfg.i2c_addr = addr;

if (!dev->dvb->frontend) {
printk(KERN_ERR "%s/2: dvb frontend not attached. "
"Can't attach xc3028\n",
dev->name);
em28xx_errdev("/2: dvb frontend not attached. "
"Can't attach xc3028\n");
return -EINVAL;
}

fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg);
if (!fe) {
printk(KERN_ERR "%s/2: xc3028 attach failed\n",
dev->name);
em28xx_errdev("/2: xc3028 attach failed\n");
dvb_frontend_detach(dev->dvb->frontend);
dev->dvb->frontend = NULL;
return -EINVAL;
}

printk(KERN_INFO "%s/2: xc3028 attached\n", dev->name);
em28xx_info("%s/2: xc3028 attached\n", dev->name);

return 0;
}
Expand Down Expand Up @@ -463,7 +461,7 @@ static int dvb_init(struct em28xx *dev)
dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);

if (dvb == NULL) {
printk(KERN_INFO "em28xx_dvb: memory allocation failed\n");
em28xx_info("em28xx_dvb: memory allocation failed\n");
return -ENOMEM;
}
dev->dvb = dvb;
Expand Down Expand Up @@ -570,15 +568,12 @@ static int dvb_init(struct em28xx *dev)
}
break;
default:
printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
" isn't supported yet\n",
dev->name);
em28xx_errdev("/2: The frontend of your DVB/ATSC card"
" isn't supported yet\n");
break;
}
if (NULL == dvb->frontend) {
printk(KERN_ERR
"%s/2: frontend initialization failed\n",
dev->name);
em28xx_errdev("/2: frontend initialization failed\n");
result = -EINVAL;
goto out_free;
}
Expand All @@ -592,7 +587,7 @@ static int dvb_init(struct em28xx *dev)
goto out_free;

em28xx_set_mode(dev, EM28XX_SUSPEND);
printk(KERN_INFO "Successfully loaded em28xx-dvb\n");
em28xx_info("Successfully loaded em28xx-dvb\n");
return 0;

out_free:
Expand Down

0 comments on commit 480be18

Please sign in to comment.