[PATCH 1/2] dmaengine: mmp-tdma: don't include mach/regs-icu.h

[PATCH 1/2] dmaengine: mmp-tdma: don't include mach/regs-icu.h

[Arnd Bergmann]

The mmp tdma driver does not actually require this header, and
we want to enable multiplatform support for MMP, which would
make it inaccessible and cause a build error.

This patch just removes the old #include.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index a8a79b1763d5..91fb241102f7 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -19,7 +19,6 @@
 #include <linux/dmaengine.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
-#include <mach/regs-icu.h>
 #include <linux/platform_data/dma-mmp_tdma.h>
 #include <linux/of_device.h>
 #include <linux/of_dma.h>

[PATCH 2/2] dmaengine: mmp-tdma: fix terminate_all return code

[Arnd Bergmann]

In a recent cleanup, the mmp_tdma_terminate_all function was
introduced but does not set a proper return value. Almost
no slave driver uses that return value, but if one does, the
result will be undefined, which the compiler warns about:

dma/mmp_tdma.c: In function 'mmp_tdma_terminate_all':
dma/mmp_tdma.c:474:1: warning: no return statement in function returning non-void [-Wreturn-type]

This changes the driver to return zero, like most other
drivers do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: f43a6fd400ba6 ("dmaengine: mmp-tdma: Split device_control")

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 91fb241102f7..70c2fa9963cd 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -471,6 +471,8 @@ static int mmp_tdma_terminate_all(struct dma_chan *chan)
 	mmp_tdma_disable_chan(chan);
 	/* disable interrupt */
 	mmp_tdma_enable_irq(tdmac, false);
+
+	return 0;
 }
 
 static int mmp_tdma_config(struct dma_chan *chan,

[PATCH 1/2] dmaengine: mmp-tdma: don't include mach/regs-icu.h

[Vinod Koul]

On Tue, Jan 13, 2015 at 02:25:19PM +0100, Arnd Bergmann wrote:
> The mmp tdma driver does not actually require this header, and
> we want to enable multiplatform support for MMP, which would
> make it inaccessible and cause a build error.
> 
> This patch just removes the old #include.
Applied, both thanks

-- 
~Vinod

> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
> index a8a79b1763d5..91fb241102f7 100644
> --- a/drivers/dma/mmp_tdma.c
> +++ b/drivers/dma/mmp_tdma.c
> @@ -19,7 +19,6 @@
>  #include <linux/dmaengine.h>
>  #include <linux/platform_device.h>
>  #include <linux/device.h>
> -#include <mach/regs-icu.h>
>  #include <linux/platform_data/dma-mmp_tdma.h>
>  #include <linux/of_device.h>
>  #include <linux/of_dma.h>
> 

--