Skip to content

Commit

Permalink
Staging: comedi: fixed coding style issues in drivers.c
Browse files Browse the repository at this point in the history 
This patch fixes coding style issues found by checkpatch.pl, and doesnt
line break string literals.

Signed-off-by: Zachary Richey <zr.public@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Zachary Richey authored and Greg Kroah-Hartman committed May 11, 2010
1 parent a2936e0 commit ac4898a
Showing 1 changed file with 20 additions and 16 deletions.
36 changes: 20 additions & 16 deletions drivers/staging/comedi/drivers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static void __comedi_device_detach(struct comedi_device *dev)
if (dev->driver)
dev->driver->detach(dev);
else
printk("BUG: dev->driver=NULL in comedi_device_detach()\n");
printk(KERN_WARNING "BUG: dev->driver=NULL in comedi_device_detach()\n");
cleanup_device(dev);
}

Expand All @@ -124,7 +124,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) {
printk
("comedi: failed to increment module count, skipping\n");
(KERN_INFO "comedi: failed to increment module count, skipping\n");
continue;
}
if (driv->num_names) {
Expand All @@ -139,7 +139,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
continue;
}
}
/* initialize dev->driver here so comedi_error() can be called from attach */
/* initialize dev->driver here so
* comedi_error() can be called from attach */
dev->driver = driv;
ret = driv->attach(dev, it);
if (ret < 0) {
Expand All @@ -154,7 +155,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* report valid board names before returning error */
for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) {
printk("comedi: failed to increment module count\n");
printk(KERN_INFO "comedi: failed to increment module count\n");
continue;
}
comedi_report_boards(driv);
Expand All @@ -172,7 +173,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}

if (!dev->board_name) {
printk("BUG: dev->board_name=<%p>\n", dev->board_name);
printk(KERN_WARNING "BUG: dev->board_name=<%p>\n", dev->board_name);
dev->board_name = "BUG";
}
smp_wmb();
Expand Down Expand Up @@ -208,7 +209,7 @@ int comedi_driver_unregister(struct comedi_driver *driver)
if (dev->attached && dev->driver == driver) {
if (dev->use_count)
printk
("BUG! detaching device with use_count=%d\n",
(KERN_WARNING "BUG! detaching device with use_count=%d\n",
dev->use_count);
comedi_device_detach(dev);
}
Expand Down Expand Up @@ -253,7 +254,7 @@ static int postconfig(struct comedi_device *dev)
async =
kzalloc(sizeof(struct comedi_async), GFP_KERNEL);
if (async == NULL) {
printk("failed to allocate async struct\n");
printk(KERN_INFO "failed to allocate async struct\n");
return -ENOMEM;
}
init_waitqueue_head(&async->wait_head);
Expand All @@ -268,7 +269,7 @@ static int postconfig(struct comedi_device *dev)
async->prealloc_buf = NULL;
async->prealloc_bufsz = 0;
if (comedi_buf_alloc(dev, s, DEFAULT_BUF_SIZE) < 0) {
printk("Buffer allocation failed\n");
printk(KERN_INFO "Buffer allocation failed\n");
return -ENOMEM;
}
if (s->buf_change) {
Expand Down Expand Up @@ -303,7 +304,8 @@ static int postconfig(struct comedi_device *dev)
return 0;
}

/* generic recognize function for drivers that register their supported board names */
/* generic recognize function for drivers
* that register their supported board names */
void *comedi_recognize(struct comedi_driver *driv, const char *name)
{
unsigned i;
Expand All @@ -324,17 +326,17 @@ void comedi_report_boards(struct comedi_driver *driv)
unsigned int i;
const char *const *name_ptr;

printk("comedi: valid board names for %s driver are:\n",
printk(KERN_INFO "comedi: valid board names for %s driver are:\n",
driv->driver_name);

name_ptr = driv->board_name;
for (i = 0; i < driv->num_names; i++) {
printk(" %s\n", *name_ptr);
printk(KERN_INFO " %s\n", *name_ptr);
name_ptr = (const char **)((char *)name_ptr + driv->offset);
}

if (driv->num_names == 0)
printk(" %s\n", driv->driver_name);
printk(KERN_INFO " %s\n", driv->driver_name);
}

static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s)
Expand Down Expand Up @@ -568,7 +570,7 @@ unsigned int comedi_buf_munge(struct comedi_async *async,

block_size = num_bytes - count;
if (block_size < 0) {
printk("%s: %s: bug! block_size is negative\n",
printk(KERN_WARNING "%s: %s: bug! block_size is negative\n",
__FILE__, __func__);
break;
}
Expand All @@ -579,7 +581,8 @@ unsigned int comedi_buf_munge(struct comedi_async *async,
s->munge(s->device, s, async->prealloc_buf + async->munge_ptr,
block_size, async->munge_chan);

smp_wmb(); /* barrier insures data is munged in buffer before munge_count is incremented */
smp_wmb(); /* barrier insures data is munged in buffer
* before munge_count is incremented */

async->munge_chan += block_size / num_sample_bytes;
async->munge_chan %= async->cmd.chanlist_len;
Expand Down Expand Up @@ -649,7 +652,7 @@ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes)
if ((int)(async->buf_write_count + nbytes -
async->buf_write_alloc_count) > 0) {
printk
("comedi: attempted to write-free more bytes than have been write-allocated.\n");
(KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
nbytes = async->buf_write_alloc_count - async->buf_write_count;
}
async->buf_write_count += nbytes;
Expand Down Expand Up @@ -678,7 +681,8 @@ unsigned comedi_buf_read_alloc(struct comedi_async *async, unsigned nbytes)
/* transfers control of a chunk from reader to free buffer space */
unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
{
/* barrier insures data has been read out of buffer before read count is incremented */
/* barrier insures data has been read out of
* buffer before read count is incremented */
smp_mb();
if ((int)(async->buf_read_count + nbytes -
async->buf_read_alloc_count) > 0) {
Expand Down

0 comments on commit ac4898a

Please sign in to comment.