Skip to content

Commit

Permalink
staging: comedi: ni_670x: change printk's to cleaned up dev_printk's
Browse files Browse the repository at this point in the history
Convert all the prink's in this file to dev_prink's.

Change the INFO message in ni_670x_find_device into a dev_warn().
This message is only displayed if a matching device was not found.
A warning is more appropriate here than info.

Consolidate the attach messages into one dev_info() output after
the successful attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 2be0366 commit b48ad33
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/staging/comedi/drivers/ni_670x.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot)
}
}
}
printk(KERN_INFO "no device found\n");
dev_warn(dev->class_dev, "no device found\n");
mite_list_devices();
return -EIO;
}
Expand All @@ -231,8 +231,6 @@ static int ni_670x_attach(struct comedi_device *dev,
int ret;
int i;

printk(KERN_INFO "comedi%d: ni_670x: ", dev->minor);

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
return ret;
Expand All @@ -245,12 +243,11 @@ static int ni_670x_attach(struct comedi_device *dev,

ret = mite_setup(devpriv->mite);
if (ret < 0) {
printk(KERN_WARNING "error setting up mite\n");
dev_warn(dev->class_dev, "error setting up mite\n");
return ret;
}
dev->board_name = thisboard->name;
dev->irq = mite_irq(devpriv->mite);
printk(KERN_INFO " %s", dev->board_name);

ret = comedi_alloc_subdevices(dev, 2);
if (ret)
Expand Down Expand Up @@ -295,7 +292,8 @@ static int ni_670x_attach(struct comedi_device *dev,
/* Config of ao registers */
writel(0x00, devpriv->mite->daq_io_addr + AO_CONTROL_OFFSET);

printk(KERN_INFO "attached\n");
dev_info(dev->class_dev, "%s: %s attached\n",
dev->driver->driver_name, dev->board_name);

return 1;
}
Expand Down

0 comments on commit b48ad33

Please sign in to comment.