Commit 480be185 authored by Filipe Rosset's avatar Filipe Rosset Committed by Mauro Carvalho Chehab

V4L/DVB (13290): em28xx-dvb: Convert printks to em28xx_err and em28xx_info

Convert printks to em28xx_err and em28xx_info
Signed-off-by: default avatarFilipe Rosset <rosset.filipe@gmail.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0bc23083
...@@ -313,22 +313,20 @@ static int attach_xc3028(u8 addr, struct em28xx *dev) ...@@ -313,22 +313,20 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
cfg.i2c_addr = addr; cfg.i2c_addr = addr;
if (!dev->dvb->frontend) { if (!dev->dvb->frontend) {
printk(KERN_ERR "%s/2: dvb frontend not attached. " em28xx_errdev("/2: dvb frontend not attached. "
"Can't attach xc3028\n", "Can't attach xc3028\n");
dev->name);
return -EINVAL; return -EINVAL;
} }
fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg); fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg);
if (!fe) { if (!fe) {
printk(KERN_ERR "%s/2: xc3028 attach failed\n", em28xx_errdev("/2: xc3028 attach failed\n");
dev->name);
dvb_frontend_detach(dev->dvb->frontend); dvb_frontend_detach(dev->dvb->frontend);
dev->dvb->frontend = NULL; dev->dvb->frontend = NULL;
return -EINVAL; return -EINVAL;
} }
printk(KERN_INFO "%s/2: xc3028 attached\n", dev->name); em28xx_info("%s/2: xc3028 attached\n", dev->name);
return 0; return 0;
} }
...@@ -463,7 +461,7 @@ static int dvb_init(struct em28xx *dev) ...@@ -463,7 +461,7 @@ static int dvb_init(struct em28xx *dev)
dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);
if (dvb == NULL) { if (dvb == NULL) {
printk(KERN_INFO "em28xx_dvb: memory allocation failed\n"); em28xx_info("em28xx_dvb: memory allocation failed\n");
return -ENOMEM; return -ENOMEM;
} }
dev->dvb = dvb; dev->dvb = dvb;
...@@ -570,15 +568,12 @@ static int dvb_init(struct em28xx *dev) ...@@ -570,15 +568,12 @@ static int dvb_init(struct em28xx *dev)
} }
break; break;
default: default:
printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card" em28xx_errdev("/2: The frontend of your DVB/ATSC card"
" isn't supported yet\n", " isn't supported yet\n");
dev->name);
break; break;
} }
if (NULL == dvb->frontend) { if (NULL == dvb->frontend) {
printk(KERN_ERR em28xx_errdev("/2: frontend initialization failed\n");
"%s/2: frontend initialization failed\n",
dev->name);
result = -EINVAL; result = -EINVAL;
goto out_free; goto out_free;
} }
...@@ -592,7 +587,7 @@ static int dvb_init(struct em28xx *dev) ...@@ -592,7 +587,7 @@ static int dvb_init(struct em28xx *dev)
goto out_free; goto out_free;
em28xx_set_mode(dev, EM28XX_SUSPEND); em28xx_set_mode(dev, EM28XX_SUSPEND);
printk(KERN_INFO "Successfully loaded em28xx-dvb\n"); em28xx_info("Successfully loaded em28xx-dvb\n");
return 0; return 0;
out_free: out_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment