Commit 67b0e64a authored by Mark Rankilor's avatar Mark Rankilor Committed by Greg Kroah-Hartman

Staging: comedi: Fixed printk call lengths and log levels

This is a patch to include log levels and fix some over length lines in
printk calls in drivers.c
Signed-off-by: default avatarMark Rankilor <reodge@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97b9e5ae
...@@ -95,7 +95,8 @@ static void __comedi_device_detach(struct comedi_device *dev) ...@@ -95,7 +95,8 @@ static void __comedi_device_detach(struct comedi_device *dev)
if (dev->driver) if (dev->driver)
dev->driver->detach(dev); dev->driver->detach(dev);
else else
printk(KERN_WARNING "BUG: dev->driver=NULL in comedi_device_detach()\n"); printk(KERN_WARNING
"BUG: dev->driver=NULL in comedi_device_detach()\n");
cleanup_device(dev); cleanup_device(dev);
} }
...@@ -148,7 +149,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -148,7 +149,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* report valid board names before returning error */ /* report valid board names before returning error */
for (driv = comedi_drivers; driv; driv = driv->next) { for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) { if (!try_module_get(driv->module)) {
printk(KERN_INFO "comedi: failed to increment module count\n"); printk(KERN_INFO
"comedi: failed to increment module count\n");
continue; continue;
} }
comedi_report_boards(driv); comedi_report_boards(driv);
...@@ -250,7 +252,8 @@ static int postconfig(struct comedi_device *dev) ...@@ -250,7 +252,8 @@ static int postconfig(struct comedi_device *dev)
async = async =
kzalloc(sizeof(struct comedi_async), GFP_KERNEL); kzalloc(sizeof(struct comedi_async), GFP_KERNEL);
if (async == NULL) { if (async == NULL) {
printk(KERN_INFO "failed to allocate async struct\n"); printk(KERN_INFO
"failed to allocate async struct\n");
return -ENOMEM; return -ENOMEM;
} }
init_waitqueue_head(&async->wait_head); init_waitqueue_head(&async->wait_head);
...@@ -560,7 +563,8 @@ static unsigned int comedi_buf_munge(struct comedi_async *async, ...@@ -560,7 +563,8 @@ static unsigned int comedi_buf_munge(struct comedi_async *async,
block_size = num_bytes - count; block_size = num_bytes - count;
if (block_size < 0) { if (block_size < 0) {
printk(KERN_WARNING "%s: %s: bug! block_size is negative\n", printk(KERN_WARNING
"%s: %s: bug! block_size is negative\n",
__FILE__, __func__); __FILE__, __func__);
break; break;
} }
...@@ -679,8 +683,8 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes) ...@@ -679,8 +683,8 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
smp_mb(); smp_mb();
if ((int)(async->buf_read_count + nbytes - if ((int)(async->buf_read_count + nbytes -
async->buf_read_alloc_count) > 0) { async->buf_read_alloc_count) > 0) {
printk printk(KERN_INFO
("comedi: attempted to read-free more bytes than have been read-allocated.\n"); "comedi: attempted to read-free more bytes than have been read-allocated.\n");
nbytes = async->buf_read_alloc_count - async->buf_read_count; nbytes = async->buf_read_alloc_count - async->buf_read_count;
} }
async->buf_read_count += nbytes; async->buf_read_count += nbytes;
......
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