diff mbox

DMA: shdma: fix compiler warning after a bad merge

Message ID Pine.LNX.4.64.1308271130360.11515@axis700.grange (mailing list archive)
State Awaiting Upstream
Delegated to: Paul Mundt
Headers show

Commit Message

Guennadi Liakhovetski Aug. 27, 2013, 9:31 a.m. UTC
A recent merge commit

commit ba1e06e3dff9a0bb0758d169e50cbb04a67a402c
Author: Vinod Koul <vinod.koul@intel.com>

    Merge branch 'topic/sh' into next

introduced a compiler warning:

drivers/dma/sh/shdmac.c: In function 'sh_dmae_probe':
drivers/dma/sh/shdmac.c:697: warning: assignment discards qualifiers from pointer target type

This patch re-adds the dropped "const" qualifier and fixes the warning.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---
 drivers/dma/sh/shdmac.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index dcd344e..1069e88 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -684,7 +684,7 @@  MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
 
 static int sh_dmae_probe(struct platform_device *pdev)
 {
-	struct sh_dmae_pdata *pdata;
+	const struct sh_dmae_pdata *pdata;
 	unsigned long irqflags = IRQF_DISABLED,
 		chan_flag[SH_DMAE_MAX_CHANNELS] = {};
 	int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];