From 5939e82f14e70b1c397318b274fcbf449c4f0f86 Mon Sep 17 00:00:00 2001
From: Mark Rankilor <reodge@gmail.com>
Date: Thu, 6 May 2010 17:36:38 +0800
Subject: [PATCH] --- yaml --- r: 197343 b: refs/heads/master c:
 67b0e64a7b219550cc3378800f680e2bb86a10f9 h: refs/heads/master i:   197341:
 3e4b5819be4b952a9499473cda2fbfe004c527f0   197339:
 4890b2aa0aa0a6a29f1d5e5a834ec2da59bc809f   197335:
 bebc4e0b42a9cf79eec2ae01edf36fd7b0f95d18   197327:
 5f1eca49a3e76ddfba94e1661ddc3f8faf3cbb60   197311:
 fa75d59fcafdaef52840297fcd6c2b1c4fbb2c18 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/comedi/drivers.c | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 883ddbde9f06..44e93a248294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97b9e5ae4039ab32ea5fcef999f6e54ca4af5c94
+refs/heads/master: 67b0e64a7b219550cc3378800f680e2bb86a10f9
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 1f48b6dca08b..4a29ed737e3f 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -95,7 +95,8 @@ static void __comedi_device_detach(struct comedi_device *dev)
 	if (dev->driver)
 		dev->driver->detach(dev);
 	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);
 }
 
@@ -148,7 +149,8 @@ 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(KERN_INFO "comedi: failed to increment module count\n");
+			printk(KERN_INFO
+			       "comedi: failed to increment module count\n");
 			continue;
 		}
 		comedi_report_boards(driv);
@@ -250,7 +252,8 @@ static int postconfig(struct comedi_device *dev)
 			async =
 			    kzalloc(sizeof(struct comedi_async), GFP_KERNEL);
 			if (async == NULL) {
-				printk(KERN_INFO "failed to allocate async struct\n");
+				printk(KERN_INFO
+				       "failed to allocate async struct\n");
 				return -ENOMEM;
 			}
 			init_waitqueue_head(&async->wait_head);
@@ -560,7 +563,8 @@ static unsigned int comedi_buf_munge(struct comedi_async *async,
 
 		block_size = num_bytes - count;
 		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__);
 			break;
 		}
@@ -679,8 +683,8 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
 	smp_mb();
 	if ((int)(async->buf_read_count + nbytes -
 		  async->buf_read_alloc_count) > 0) {
-		printk
-		    ("comedi: attempted to read-free more bytes than have been read-allocated.\n");
+		printk(KERN_INFO
+		       "comedi: attempted to read-free more bytes than have been read-allocated.\n");
 		nbytes = async->buf_read_alloc_count - async->buf_read_count;
 	}
 	async->buf_read_count += nbytes;