aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXenofon Foukas <foukas.xenofon@gmail.com>2010-12-03 17:17:55 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 19:39:06 -0500
commit88ab8a8445838785e38af378740ab57f8cb6cb8a (patch)
tree57f28efdd9432b23633540919b3974f5905ce67e
parentfd599985e649c71162495d307a2fd1bbddc258e4 (diff)
Staging: comedi: Fix coding style issues in drivers.c
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>
-rw-r--r--drivers/staging/comedi/drivers.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index ef24a530278..dca861ee046 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -117,8 +117,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
117 117
118 for (driv = comedi_drivers; driv; driv = driv->next) { 118 for (driv = comedi_drivers; driv; driv = driv->next) {
119 if (!try_module_get(driv->module)) { 119 if (!try_module_get(driv->module)) {
120 printk 120 printk(KERN_INFO "comedi: failed to increment module count, skipping\n");
121 (KERN_INFO "comedi: failed to increment module count, skipping\n");
122 continue; 121 continue;
123 } 122 }
124 if (driv->num_names) { 123 if (driv->num_names) {
@@ -205,9 +204,8 @@ int comedi_driver_unregister(struct comedi_driver *driver)
205 mutex_lock(&dev->mutex); 204 mutex_lock(&dev->mutex);
206 if (dev->attached && dev->driver == driver) { 205 if (dev->attached && dev->driver == driver) {
207 if (dev->use_count) 206 if (dev->use_count)
208 printk 207 printk(KERN_WARNING "BUG! detaching device with use_count=%d\n",
209 (KERN_WARNING "BUG! detaching device with use_count=%d\n", 208 dev->use_count);
210 dev->use_count);
211 comedi_device_detach(dev); 209 comedi_device_detach(dev);
212 } 210 }
213 mutex_unlock(&dev->mutex); 211 mutex_unlock(&dev->mutex);
@@ -442,7 +440,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
442 unsigned i; 440 unsigned i;
443 for (i = 0; i < async->n_buf_pages; ++i) { 441 for (i = 0; i < async->n_buf_pages; ++i) {
444 if (async->buf_page_list[i].virt_addr) { 442 if (async->buf_page_list[i].virt_addr) {
445 clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags)); 443 clear_bit(PG_reserved,
444 &(virt_to_page(async->buf_page_list[i].
445 virt_addr)->flags));
446 if (s->async_dma_dir != DMA_NONE) { 446 if (s->async_dma_dir != DMA_NONE) {
447 dma_free_coherent(dev->hw_dev, 447 dma_free_coherent(dev->hw_dev,
448 PAGE_SIZE, 448 PAGE_SIZE,
@@ -494,8 +494,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
494 break; 494 break;
495 495
496 set_bit(PG_reserved, 496 set_bit(PG_reserved,
497 &(virt_to_page(async->buf_page_list[i].virt_addr)->flags)); 497 &(virt_to_page(async->buf_page_list[i].
498 pages[i] = virt_to_page(async->buf_page_list[i].virt_addr); 498 virt_addr)->flags));
499 pages[i] = virt_to_page(async->buf_page_list[i].
500 virt_addr);
499 } 501 }
500 } 502 }
501 if (i == n_pages) { 503 if (i == n_pages) {
@@ -512,7 +514,10 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
512 NULL) { 514 NULL) {
513 break; 515 break;
514 } 516 }
515 clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags)); 517 clear_bit(PG_reserved,
518 &(virt_to_page(async->
519 buf_page_list[i].
520 virt_addr)->flags));
516 if (s->async_dma_dir != DMA_NONE) { 521 if (s->async_dma_dir != DMA_NONE) {
517 dma_free_coherent(dev->hw_dev, 522 dma_free_coherent(dev->hw_dev,
518 PAGE_SIZE, 523 PAGE_SIZE,
@@ -644,8 +649,7 @@ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes)
644{ 649{
645 if ((int)(async->buf_write_count + nbytes - 650 if ((int)(async->buf_write_count + nbytes -
646 async->buf_write_alloc_count) > 0) { 651 async->buf_write_alloc_count) > 0) {
647 printk 652 printk(KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
648 (KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
649 nbytes = async->buf_write_alloc_count - async->buf_write_count; 653 nbytes = async->buf_write_alloc_count - async->buf_write_count;
650 } 654 }
651 async->buf_write_count += nbytes; 655 async->buf_write_count += nbytes;