[media] em28xx: convert the remaining printks to pr_foo
There are still several places with printk's called directly. Convert them to pr_foo() macros, except for the debug printk's, as those are enabled via modprobe vars. While here, realign the pr_foo() arguments to match the recommended CodingStyle. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
このコミットが含まれているのは:
@@ -935,19 +935,19 @@ static int em28xx_attach_xc3028(u8 addr, struct em28xx *dev)
|
||||
cfg.ctrl = &ctl;
|
||||
|
||||
if (!dev->dvb->fe[0]) {
|
||||
pr_err("/2: dvb frontend not attached. Can't attach xc3028\n");
|
||||
pr_err("dvb frontend not attached. Can't attach xc3028\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
fe = dvb_attach(xc2028_attach, dev->dvb->fe[0], &cfg);
|
||||
if (!fe) {
|
||||
pr_err("/2: xc3028 attach failed\n");
|
||||
pr_err("xc3028 attach failed\n");
|
||||
dvb_frontend_detach(dev->dvb->fe[0]);
|
||||
dev->dvb->fe[0] = NULL;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pr_info("%s/2: xc3028 attached\n", dev->name);
|
||||
pr_info("xc3028 attached\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -966,8 +966,8 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
|
||||
result = dvb_register_adapter(&dvb->adapter, dev->name, module, device,
|
||||
adapter_nr);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("dvb_register_adapter failed (errno = %d)\n",
|
||||
result);
|
||||
goto fail_adapter;
|
||||
}
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER_DVB
|
||||
@@ -984,8 +984,8 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
|
||||
/* register frontend */
|
||||
result = dvb_register_frontend(&dvb->adapter, dvb->fe[0]);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("dvb_register_frontend failed (errno = %d)\n",
|
||||
result);
|
||||
goto fail_frontend0;
|
||||
}
|
||||
|
||||
@@ -993,8 +993,8 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
|
||||
if (dvb->fe[1]) {
|
||||
result = dvb_register_frontend(&dvb->adapter, dvb->fe[1]);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: 2nd dvb_register_frontend failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("2nd dvb_register_frontend failed (errno = %d)\n",
|
||||
result);
|
||||
goto fail_frontend1;
|
||||
}
|
||||
}
|
||||
@@ -1011,8 +1011,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
|
||||
|
||||
result = dvb_dmx_init(&dvb->demux);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("dvb_dmx_init failed (errno = %d)\n", result);
|
||||
goto fail_dmx;
|
||||
}
|
||||
|
||||
@@ -1021,31 +1020,29 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
|
||||
dvb->dmxdev.capabilities = 0;
|
||||
result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("dvb_dmxdev_init failed (errno = %d)\n", result);
|
||||
goto fail_dmxdev;
|
||||
}
|
||||
|
||||
dvb->fe_hw.source = DMX_FRONTEND_0;
|
||||
result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
|
||||
result);
|
||||
goto fail_fe_hw;
|
||||
}
|
||||
|
||||
dvb->fe_mem.source = DMX_MEMORY_FE;
|
||||
result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
|
||||
result);
|
||||
goto fail_fe_mem;
|
||||
}
|
||||
|
||||
result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
|
||||
if (result < 0) {
|
||||
printk(KERN_WARNING "%s: connect_frontend failed (errno = %d)\n",
|
||||
dev->name, result);
|
||||
pr_warn("connect_frontend failed (errno = %d)\n", result);
|
||||
goto fail_fe_conn;
|
||||
}
|
||||
|
||||
@@ -1936,11 +1933,11 @@ static int em28xx_dvb_init(struct em28xx *dev)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
pr_err("/2: The frontend of your DVB/ATSC card isn't supported yet\n");
|
||||
pr_err("The frontend of your DVB/ATSC card isn't supported yet\n");
|
||||
break;
|
||||
}
|
||||
if (NULL == dvb->fe[0]) {
|
||||
pr_err("/2: frontend initialization failed\n");
|
||||
pr_err("frontend initialization failed\n");
|
||||
result = -EINVAL;
|
||||
goto out_free;
|
||||
}
|
||||
|
新しいイシューから参照
ユーザーをブロックする