Commit 0e5789f5 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: ni_65xx: convert printk() to dev_...()

Convert the `printk()` calls in this drivers to use the `dev_...()`
calls instead.  Remove the initial `printk()` call in the comedi
`attach()` handler (`ni_65xx_attach()`) as it's a bit redundant - the
board type and contents of a board ID register are printed later in the
function.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 372959d2
...@@ -453,11 +453,9 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev, ...@@ -453,11 +453,9 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
writeb(bits, writeb(bits,
private(dev)->mite->daq_io_addr + private(dev)->mite->daq_io_addr +
Port_Data(port)); Port_Data(port));
/* printk("wrote 0x%x to port %i\n", bits, port); */
} }
port_read_bits = port_read_bits =
readb(private(dev)->mite->daq_io_addr + Port_Data(port)); readb(private(dev)->mite->daq_io_addr + Port_Data(port));
/* printk("read 0x%x from port %i\n", port_read_bits, port); */
if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) { if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) {
/* Outputs inverted, so invert value read back from /* Outputs inverted, so invert value read back from
* DO subdevice. (Does not apply to boards with DIO * DO subdevice. (Does not apply to boards with DIO
...@@ -651,8 +649,6 @@ static int ni_65xx_attach(struct comedi_device *dev, ...@@ -651,8 +649,6 @@ static int ni_65xx_attach(struct comedi_device *dev,
unsigned i; unsigned i;
int ret; int ret;
printk(KERN_INFO "comedi%d: ni_65xx:", dev->minor);
ret = alloc_private(dev, sizeof(struct ni_65xx_private)); ret = alloc_private(dev, sizeof(struct ni_65xx_private));
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -663,15 +659,13 @@ static int ni_65xx_attach(struct comedi_device *dev, ...@@ -663,15 +659,13 @@ static int ni_65xx_attach(struct comedi_device *dev,
ret = mite_setup(private(dev)->mite); ret = mite_setup(private(dev)->mite);
if (ret < 0) { if (ret < 0) {
printk(KERN_WARNING "error setting up mite\n"); dev_warn(dev->class_dev, "error setting up mite\n");
return ret; return ret;
} }
dev->board_name = board(dev)->name; dev->board_name = board(dev)->name;
dev->irq = mite_irq(private(dev)->mite); dev->irq = mite_irq(private(dev)->mite);
printk(KERN_INFO " %s", dev->board_name); dev_info(dev->class_dev, "board: %s, ID=0x%02x", dev->board_name,
printk(KERN_INFO " ID=0x%02x",
readb(private(dev)->mite->daq_io_addr + ID_Register)); readb(private(dev)->mite->daq_io_addr + ID_Register));
ret = comedi_alloc_subdevices(dev, 4); ret = comedi_alloc_subdevices(dev, 4);
...@@ -772,11 +766,9 @@ static int ni_65xx_attach(struct comedi_device *dev, ...@@ -772,11 +766,9 @@ static int ni_65xx_attach(struct comedi_device *dev,
"ni_65xx", dev); "ni_65xx", dev);
if (ret < 0) { if (ret < 0) {
dev->irq = 0; dev->irq = 0;
printk(KERN_WARNING " irq not available"); dev_warn(dev->class_dev, "irq not available\n");
} }
printk("\n");
return 0; return 0;
} }
...@@ -825,7 +817,7 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot) ...@@ -825,7 +817,7 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot)
} }
} }
} }
printk(KERN_WARNING "no device found\n"); dev_warn(dev->class_dev, "no device found\n");
mite_list_devices(); mite_list_devices();
return -EIO; return -EIO;
} }
......
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