1 files changed, 22 insertions, 23 deletions

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index eacb8be99812..7dafb9f3785f 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -936,7 +936,7 @@ static irqreturn_t iop_adma_err_handler(int irq, void *data)
         struct iop_adma_chan *chan = data;
         unsigned long status = iop_chan_get_status(chan);
 
-        dev_printk(KERN_ERR, chan->device->common.dev,
+        dev_err(chan->device->common.dev,
                 "error ( %s%s%s%s%s%s%s)\n",
                 iop_is_err_int_parity(status, chan) ? "int_parity " : "",
                 iop_is_err_mcu_abort(status, chan) ? "mcu_abort " : "",
@@ -1017,7 +1017,7 @@ static int iop_adma_memcpy_self_test(struct iop_adma_device *device)
 
         if (iop_adma_status(dma_chan, cookie, NULL) !=
                         DMA_SUCCESS) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test copy timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1027,7 +1027,7 @@ static int iop_adma_memcpy_self_test(struct iop_adma_device *device)
         dma_sync_single_for_cpu(&iop_chan->device->pdev->dev, dest_dma,
                 IOP_ADMA_TEST_SIZE, DMA_FROM_DEVICE);
         if (memcmp(src, dest, IOP_ADMA_TEST_SIZE)) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test copy failed compare, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1117,7 +1117,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
 
         if (iop_adma_status(dma_chan, cookie, NULL) !=
                 DMA_SUCCESS) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test xor timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1129,7 +1129,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
         for (i = 0; i < (PAGE_SIZE / sizeof(u32)); i++) {
                 u32 *ptr = page_address(dest);
                 if (ptr[i] != cmp_word) {
-                        dev_printk(KERN_ERR, dma_chan->device->dev,
+                        dev_err(dma_chan->device->dev,
                                 "Self-test xor failed compare, disabling\n");
                         err = -ENODEV;
                         goto free_resources;
@@ -1163,14 +1163,14 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
         msleep(8);
 
         if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test zero sum timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
         }
 
         if (zero_sum_result != 0) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test zero sum failed compare, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1187,7 +1187,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
         msleep(8);
 
         if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test memset timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1196,7 +1196,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
         for (i = 0; i < PAGE_SIZE/sizeof(u32); i++) {
                 u32 *ptr = page_address(dest);
                 if (ptr[i]) {
-                        dev_printk(KERN_ERR, dma_chan->device->dev,
+                        dev_err(dma_chan->device->dev,
                                 "Self-test memset failed compare, disabling\n");
                         err = -ENODEV;
                         goto free_resources;
@@ -1219,14 +1219,14 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device)
         msleep(8);
 
         if (iop_adma_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test non-zero sum timed out, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
         }
 
         if (zero_sum_result != 1) {
-                dev_printk(KERN_ERR, dma_chan->device->dev,
+                dev_err(dma_chan->device->dev,
                         "Self-test non-zero sum failed compare, disabling\n");
                 err = -ENODEV;
                 goto free_resources;
@@ -1579,15 +1579,14 @@ static int iop_adma_probe(struct platform_device *pdev)
                         goto err_free_iop_chan;
         }
 
-        dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "
-          "( %s%s%s%s%s%s%s)\n",
-          dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",
-          dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
-          dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
-          dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
-          dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
-          dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
-          dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
+        dev_info(&pdev->dev, "Intel(R) IOP: ( %s%s%s%s%s%s%s)\n",
+                 dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",
+                 dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
+                 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
+                 dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
+                 dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
+                 dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
+                 dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
 
         dma_async_device_register(dma_dev);
         goto out;
@@ -1651,8 +1650,8 @@ static void iop_chan_start_null_memcpy(struct iop_adma_chan *iop_chan)
                 /* run the descriptor */
                 iop_chan_enable(iop_chan);
         } else
-                dev_printk(KERN_ERR, iop_chan->device->common.dev,
-                         "failed to allocate null descriptor\n");
+                dev_err(iop_chan->device->common.dev,
+                        "failed to allocate null descriptor\n");
         spin_unlock_bh(&iop_chan->lock);
 }
 
@@ -1704,7 +1703,7 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan)
                 /* run the descriptor */
                 iop_chan_enable(iop_chan);
         } else
-                dev_printk(KERN_ERR, iop_chan->device->common.dev,
+                dev_err(iop_chan->device->common.dev,
                         "failed to allocate null descriptor\n");
         spin_unlock_bh(&iop_chan->lock);
 }