* [PATCH 2/2] Staging: comedi: fl512: Replace printk with dev_info et al
@ 2012-09-13 1:46 Bruce Humphrey
2012-09-13 8:03 ` Dan Carpenter
0 siblings, 1 reply; 2+ messages in thread
From: Bruce Humphrey @ 2012-09-13 1:46 UTC (permalink / raw)
To: abbotti, fmhess, gregkh
Cc: hsweeten, standby24x7, devel, linux-kernel, Bruce Humphrey
Replace printk(KERN_XXX with the appropiate dev_info, dev_warn, dev_dbg in fl512.c
Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.com>
---
drivers/staging/comedi/drivers/fl512.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index d1da809..5a8e0ae 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
iobase = it->options[0];
- printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
+ dev_info(dev->class_dev, "%s: 0x%04lx\n", dev->board_name, iobase);
if (!request_region(iobase, FL512_SIZE, "fl512")) {
- printk(KERN_WARNING " I/O port conflict\n");
+ dev_warn(dev->class_dev, " I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -129,7 +129,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENOMEM;
#if DEBUG
- printk(KERN_DEBUG "malloc ok\n");
+ dev_dbg(dev->class_dev, "malloc ok\n");
#endif
ret = comedi_alloc_subdevices(dev, 2);
@@ -153,7 +153,8 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_fl512;
/* function to call when read AD */
s->insn_read = fl512_ai_insn;
- printk(KERN_INFO "comedi: fl512: subdevice 0 initialized\n");
+ dev_info(dev->class_dev, "%s: subdevice 0 initialized\n",
+ dev->board_name);
/* Analog output */
s = dev->subdevices + 1;
@@ -171,7 +172,8 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_write = fl512_ao_insn;
/* function to call when reading DA */
s->insn_read = fl512_ao_insn_readback;
- printk(KERN_INFO "comedi: fl512: subdevice 1 initialized\n");
+ dev_info(dev->class_dev, "%s: subdevice 1 initialized\n",
+ dev->board_name);
return 1;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 2/2] Staging: comedi: fl512: Replace printk with dev_info et al
2012-09-13 1:46 [PATCH 2/2] Staging: comedi: fl512: Replace printk with dev_info et al Bruce Humphrey
@ 2012-09-13 8:03 ` Dan Carpenter
0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2012-09-13 8:03 UTC (permalink / raw)
To: Bruce Humphrey; +Cc: abbotti, fmhess, gregkh, devel, linux-kernel
On Thu, Sep 13, 2012 at 03:46:36AM +0200, Bruce Humphrey wrote:
> Replace printk(KERN_XXX with the appropiate dev_info, dev_warn, dev_dbg in fl512.c
>
> Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.com>
> ---
> drivers/staging/comedi/drivers/fl512.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
> index d1da809..5a8e0ae 100644
> --- a/drivers/staging/comedi/drivers/fl512.c
> +++ b/drivers/staging/comedi/drivers/fl512.c
> @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> struct comedi_subdevice *s;
>
> iobase = it->options[0];
> - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> + dev_info(dev->class_dev, "%s: 0x%04lx\n", dev->board_name, iobase);
Only print this at the end when it succeeds.
> if (!request_region(iobase, FL512_SIZE, "fl512")) {
> - printk(KERN_WARNING " I/O port conflict\n");
> + dev_warn(dev->class_dev, " I/O port conflict\n");
^
Bogus space.
> return -EIO;
> }
> dev->iobase = iobase;
> @@ -129,7 +129,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> return -ENOMEM;
>
> #if DEBUG
> - printk(KERN_DEBUG "malloc ok\n");
> + dev_dbg(dev->class_dev, "malloc ok\n");
> #endif
Remove this section.
>
> ret = comedi_alloc_subdevices(dev, 2);
> @@ -153,7 +153,8 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> s->range_table = &range_fl512;
> /* function to call when read AD */
> s->insn_read = fl512_ai_insn;
> - printk(KERN_INFO "comedi: fl512: subdevice 0 initialized\n");
> + dev_info(dev->class_dev, "%s: subdevice 0 initialized\n",
> + dev->board_name);
Delete.
>
> /* Analog output */
> s = dev->subdevices + 1;
> @@ -171,7 +172,8 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> s->insn_write = fl512_ao_insn;
> /* function to call when reading DA */
> s->insn_read = fl512_ao_insn_readback;
> - printk(KERN_INFO "comedi: fl512: subdevice 1 initialized\n");
> + dev_info(dev->class_dev, "%s: subdevice 1 initialized\n",
> + dev->board_name);
Move the print from the start down to here. Re-word it. Copy from
one that Hartley has worked on.
regards,
dan carpenter
>
> return 1;
> }
> --
> 1.7.9.5
>
> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-13 8:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-13 1:46 [PATCH 2/2] Staging: comedi: fl512: Replace printk with dev_info et al Bruce Humphrey
2012-09-13 8:03 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox