Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/staging/iio/industrialio-core.c    |    7 +++----
 drivers/staging/iio/industrialio-ring.c    |   21 +++++++--------------
 drivers/staging/iio/industrialio-trigger.c |    2 +-
 drivers/staging/iio/ring_sw.c              |    5 ++---
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 1fa18f2..31488c7 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -456,7 +456,7 @@ static int __init iio_dev_init(void)
 
 	err = alloc_chrdev_region(&iio_devt, 0, IIO_DEV_MAX, "iio");
 	if (err < 0)
-		printk(KERN_ERR "%s: failed to allocate char dev region\n",
+		pr_err("%s: failed to allocate char dev region\n",
 		       __FILE__);
 
 	return err;
@@ -475,9 +475,8 @@ static int __init iio_init(void)
 	/* Create sysfs class */
 	ret  = class_register(&iio_class);
 	if (ret < 0) {
-		printk(KERN_ERR
-		       "%s could not create sysfs class\n",
-			__FILE__);
+		pr_err("%s could not create sysfs class\n",
+		       __FILE__);
 		goto error_nothing;
 	}
 
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index ebe5ccc..d4800b6 100644
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -228,7 +228,7 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
 	dev_set_name(&buf->access_dev, "ring_access%d", buf->access_id);
 	ret = device_add(&buf->access_dev);
 	if (ret < 0) {
-		printk(KERN_ERR "failed to add the ring access dev\n");
+		pr_err("failed to add the ring access dev\n");
 		goto error_free_idr;
 	}
 
@@ -237,7 +237,7 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
 
 	ret = cdev_add(&buf->access_handler.chrdev, buf->access_dev.devt, 1);
 	if (ret) {
-		printk(KERN_ERR "failed to allocate ring access chrdev\n");
+		pr_err("failed to allocate ring access chrdev\n");
 		goto error_device_unregister;
 	}
 	return 0;
@@ -389,25 +389,21 @@ ssize_t iio_store_ring_enable(struct device *dev,
 	requested_state = !(buf[0] == '0');
 	current_state = !!(previous_mode & INDIO_ALL_RING_MODES);
 	if (current_state == requested_state) {
-		printk(KERN_INFO "iio-ring, current state requested again\n");
+		pr_info("iio-ring, current state requested again\n");
 		goto done;
 	}
 	if (requested_state) {
 		if (ring->preenable) {
 			ret = ring->preenable(dev_info);
 			if (ret) {
-				printk(KERN_ERR
-				       "Buffer not started:"
-				       "ring preenable failed\n");
+				pr_err("Buffer not started:ring preenable failed\n");
 				goto error_ret;
 			}
 		}
 		if (ring->access.request_update) {
 			ret = ring->access.request_update(ring);
 			if (ret) {
-				printk(KERN_INFO
-				       "Buffer not started:"
-				       "ring parameter update failed\n");
+				pr_info("Buffer not started:ring parameter update failed\n");
 				goto error_ret;
 			}
 		}
@@ -416,8 +412,7 @@ ssize_t iio_store_ring_enable(struct device *dev,
 		/* Definitely possible for devices to support both of these.*/
 		if (dev_info->modes & INDIO_RING_TRIGGERED) {
 			if (!dev_info->trig) {
-				printk(KERN_INFO
-				       "Buffer not started: no trigger\n");
+				pr_info("Buffer not started: no trigger\n");
 				ret = -EINVAL;
 				if (ring->access.unmark_in_use)
 					ring->access.unmark_in_use(ring);
@@ -435,9 +430,7 @@ ssize_t iio_store_ring_enable(struct device *dev,
 
 			ret = ring->postenable(dev_info);
 			if (ret) {
-				printk(KERN_INFO
-				       "Buffer not started:"
-				       "postenable failed\n");
+				pr_info("Buffer not started:postenable failed\n");
 				if (ring->access.unmark_in_use)
 					ring->access.unmark_in_use(ring);
 				dev_info->currentmode = previous_mode;
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 693ebc4..fc52146 100644
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -233,7 +233,7 @@ int iio_trigger_attach_poll_func(struct iio_trigger *trig,
 	if (trig->set_trigger_state)
 		ret = trig->set_trigger_state(trig, true);
 	if (ret) {
-		printk(KERN_ERR "set trigger state failed\n");
+		pr_err("set trigger state failed\n");
 		list_del(&pf->list);
 	}
 	return ret;
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index 359ff92..c31e426 100644
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -164,9 +164,8 @@ int iio_rip_sw_rb(struct iio_ring_buffer *r,
 	 */
 	if (count % ring->buf.bpd) {
 		ret = -EINVAL;
-		printk(KERN_INFO "Ring buffer read request not whole number of"
-		       "samples: Request bytes %zd, Current bpd %d\n",
-		       count, ring->buf.bpd);
+		pr_info("Ring buffer read request not whole number ofsamples: Request bytes %zd, Current bpd %d\n",
+			count, ring->buf.bpd);
 		goto error_ret;
 	}
 	/* Limit size to whole of ring buffer */
-- 
1.6.5.rc3.dirty

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel