All of lore.kernel.org
 help / color / mirror / Atom feed
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/30] dma: mv_xor: use dev_(err|info|notice) instead of dev_printk
Date: Mon, 19 Nov 2012 11:04:39 +0100	[thread overview]
Message-ID: <1353319508-30566-2-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1353319508-30566-1-git-send-email-thomas.petazzoni@free-electrons.com>

The usage of dev_printk() is deprecated, and the dev_err(), dev_info()
and dev_notice() functions should be used instead.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 drivers/dma/mv_xor.c |   60 +++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index e362e2b..610d0b8 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -206,9 +206,9 @@ static void mv_set_mode(struct mv_xor_chan *chan,
 		op_mode = XOR_OPERATION_MODE_MEMSET;
 		break;
 	default:
-		dev_printk(KERN_ERR, chan->device->common.dev,
-			   "error: unsupported operation %d.\n",
-			   type);
+		dev_err(chan->device->common.dev,
+			"error: unsupported operation %d.\n",
+			type);
 		BUG();
 		return;
 	}
@@ -828,28 +828,28 @@ static void mv_dump_xor_regs(struct mv_xor_chan *chan)
 	u32 val;
 
 	val = __raw_readl(XOR_CONFIG(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "config       0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"config       0x%08x.\n", val);
 
 	val = __raw_readl(XOR_ACTIVATION(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "activation   0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"activation   0x%08x.\n", val);
 
 	val = __raw_readl(XOR_INTR_CAUSE(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "intr cause   0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"intr cause   0x%08x.\n", val);
 
 	val = __raw_readl(XOR_INTR_MASK(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "intr mask    0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"intr mask    0x%08x.\n", val);
 
 	val = __raw_readl(XOR_ERROR_CAUSE(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "error cause  0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"error cause  0x%08x.\n", val);
 
 	val = __raw_readl(XOR_ERROR_ADDR(chan));
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "error addr   0x%08x.\n", val);
+	dev_err(chan->device->common.dev,
+		"error addr   0x%08x.\n", val);
 }
 
 static void mv_xor_err_interrupt_handler(struct mv_xor_chan *chan,
@@ -861,9 +861,9 @@ static void mv_xor_err_interrupt_handler(struct mv_xor_chan *chan,
 	     return;
 	}
 
-	dev_printk(KERN_ERR, chan->device->common.dev,
-		   "error on chan %d. intr cause 0x%08x.\n",
-		   chan->idx, intr_cause);
+	dev_err(chan->device->common.dev,
+		"error on chan %d. intr cause 0x%08x.\n",
+		chan->idx, intr_cause);
 
 	mv_dump_xor_regs(chan);
 	BUG();
@@ -950,8 +950,8 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
 
 	if (mv_xor_status(dma_chan, cookie, NULL) !=
 	    DMA_SUCCESS) {
-		dev_printk(KERN_ERR, dma_chan->device->dev,
-			   "Self-test copy timed out, disabling\n");
+		dev_err(dma_chan->device->dev,
+			"Self-test copy timed out, disabling\n");
 		err = -ENODEV;
 		goto free_resources;
 	}
@@ -960,8 +960,8 @@ static int __devinit mv_xor_memcpy_self_test(struct mv_xor_device *device)
 	dma_sync_single_for_cpu(&mv_chan->device->pdev->dev, dest_dma,
 				MV_XOR_TEST_SIZE, DMA_FROM_DEVICE);
 	if (memcmp(src, dest, MV_XOR_TEST_SIZE)) {
-		dev_printk(KERN_ERR, dma_chan->device->dev,
-			   "Self-test copy failed compare, disabling\n");
+		dev_err(dma_chan->device->dev,
+			"Self-test copy failed compare, disabling\n");
 		err = -ENODEV;
 		goto free_resources;
 	}
@@ -1048,8 +1048,8 @@ mv_xor_xor_self_test(struct mv_xor_device *device)
 
 	if (mv_xor_status(dma_chan, cookie, NULL) !=
 	    DMA_SUCCESS) {
-		dev_printk(KERN_ERR, dma_chan->device->dev,
-			   "Self-test xor timed out, disabling\n");
+		dev_err(dma_chan->device->dev,
+			"Self-test xor timed out, disabling\n");
 		err = -ENODEV;
 		goto free_resources;
 	}
@@ -1060,10 +1060,10 @@ mv_xor_xor_self_test(struct mv_xor_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,
-				   "Self-test xor failed compare, disabling."
-				   " index %d, data %x, expected %x\n", i,
-				   ptr[i], cmp_word);
+			dev_err(dma_chan->device->dev,
+				"Self-test xor failed compare, disabling."
+				" index %d, data %x, expected %x\n", i,
+				ptr[i], cmp_word);
 			err = -ENODEV;
 			goto free_resources;
 		}
@@ -1212,7 +1212,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)
 			goto err_free_dma;
 	}
 
-	dev_printk(KERN_INFO, &pdev->dev, "Marvell XOR: "
+	dev_info(&pdev->dev, "Marvell XOR: "
 	  "( %s%s%s%s)\n",
 	  dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
 	  dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
@@ -1275,7 +1275,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
 	struct mv_xor_shared_private *msp;
 	struct resource *res;
 
-	dev_printk(KERN_NOTICE, &pdev->dev, "Marvell shared XOR driver\n");
+	dev_notice(&pdev->dev, "Marvell shared XOR driver\n");
 
 	msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
 	if (!msp)
-- 
1.7.9.5

  reply	other threads:[~2012-11-19 10:04 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-19 10:04 [GIT PULL] Marvell XOR driver cleanup and DT binding Thomas Petazzoni
2012-11-19 10:04 ` Thomas Petazzoni [this message]
2012-11-19 10:04 ` [PATCH 02/30] dma: mv_xor: do not use pool_size from platform_data within the driver Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 03/30] dma: mv_xor: split initialization/cleanup of XOR channels Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 04/30] dma: mv_xor: allow channels to be registered directly from the main device Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 05/30] arm: plat-orion: convert the registration of the xor0 engine to the single driver Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 06/30] arm: plat-orion: convert the registration of the xor1 " Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 07/30] arm: plat-orion: remove unused orion_xor_init_channels() Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 08/30] dma: mv_xor: remove sub-driver 'mv_xor' Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 09/30] dma: mv_xor: remove 'shared' from mv_xor_platform_data Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 10/30] dma: mv_xor: rename mv_xor_platform_data to mv_xor_channel_data Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 11/30] dma: mv_xor: rename mv_xor_shared_platform_data to mv_xor_platform_data Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 12/30] dma: mv_xor: change the driver name to 'mv_xor' Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 13/30] dma: mv_xor: rename many symbols to remove the 'shared' word Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 14/30] dma: mv_xor: remove unused id field in mv_xor_device structure Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 15/30] dma: mv_xor: remove unused to_mv_xor_device() macro Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 16/30] dma: mv_xor: simplify dma_sync_single_for_cpu() calls Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 17/30] dma: mv_xor: introduce a mv_chan_to_devp() helper Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 18/30] dma: mv_xor: get rid of the pdev pointer in mv_xor_device Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 19/30] dma: mv_xor: in mv_xor_chan, rename 'common' to 'dmachan' Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 20/30] dma: mv_xor: in mv_xor_device, rename 'common' to 'dmadev' Thomas Petazzoni
2012-11-19 10:04 ` [PATCH 21/30] dma: mv_xor: use mv_xor_chan pointers as arguments to self-test functions Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 22/30] dma: mv_xor: merge mv_xor_device and mv_xor_chan Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 23/30] dma: mv_xor: rename mv_xor_private to mv_xor_device Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 24/30] dma: mv_xor: remove useless backpointer from mv_xor_chan " Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 25/30] dma: mv_xor: remove hw_id field from platform_data Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 26/30] dma: mv_xor: remove the pool_size " Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 27/30] dma: mv_xor: add missing free_irq() call Thomas Petazzoni
     [not found] ` <1353319508-30566-1-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2012-11-19 10:05   ` [PATCH 28/30] dma: mv_xor: add Device Tree binding Thomas Petazzoni
2012-11-19 10:05     ` Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 29/30] dma: mv_xor: add missing __devinit and __devexit qualifiers on probe and remove Thomas Petazzoni
2012-11-19 10:05 ` [PATCH 30/30] dma: mv_xor: Add a device_control function Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353319508-30566-2-git-send-email-thomas.petazzoni@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.