Skip to content

Commit

Permalink
Staging: comedi: Fix coding style issues in drivers.c
Browse files Browse the repository at this point in the history
This patch fixes line over 80 characters warning issues found
in file drivers.c

Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Xenofon Foukas authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent fd59998 commit 88ab8a8
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,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
(KERN_INFO "comedi: failed to increment module count, skipping\n");
printk(KERN_INFO "comedi: failed to increment module count, skipping\n");
continue;
}
if (driv->num_names) {
Expand Down Expand Up @@ -205,9 +204,8 @@ int comedi_driver_unregister(struct comedi_driver *driver)
mutex_lock(&dev->mutex);
if (dev->attached && dev->driver == driver) {
if (dev->use_count)
printk
(KERN_WARNING "BUG! detaching device with use_count=%d\n",
dev->use_count);
printk(KERN_WARNING "BUG! detaching device with use_count=%d\n",
dev->use_count);
comedi_device_detach(dev);
}
mutex_unlock(&dev->mutex);
Expand Down Expand Up @@ -442,7 +440,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned i;
for (i = 0; i < async->n_buf_pages; ++i) {
if (async->buf_page_list[i].virt_addr) {
clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
clear_bit(PG_reserved,
&(virt_to_page(async->buf_page_list[i].
virt_addr)->flags));
if (s->async_dma_dir != DMA_NONE) {
dma_free_coherent(dev->hw_dev,
PAGE_SIZE,
Expand Down Expand Up @@ -494,8 +494,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
break;

set_bit(PG_reserved,
&(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
pages[i] = virt_to_page(async->buf_page_list[i].virt_addr);
&(virt_to_page(async->buf_page_list[i].
virt_addr)->flags));
pages[i] = virt_to_page(async->buf_page_list[i].
virt_addr);
}
}
if (i == n_pages) {
Expand All @@ -512,7 +514,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
NULL) {
break;
}
clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
clear_bit(PG_reserved,
&(virt_to_page(async->
buf_page_list[i].
virt_addr)->flags));
if (s->async_dma_dir != DMA_NONE) {
dma_free_coherent(dev->hw_dev,
PAGE_SIZE,
Expand Down Expand Up @@ -644,8 +649,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
(KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
printk(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

0 comments on commit 88ab8a8

Please sign in to comment.