Sergei Shtylyov 08d08bcdee rcar-hpbdma: add parameter to set_slave() method ... Commit 4981c4dc19 (DMA: shdma: switch DT mode to use configuration data from a match table) added a new parameter to set_slave() method but unfortunately got merged later than commit c4f6c41ba7 (dma: add driver for R-Car HPB-DMAC), so that the HPB-DMAC driver retained the old prototype which caused this warning: drivers/dma/sh/rcar-hpbdma.c:485: warning: initialization from incompatible pointer type The newly added parameter is used to override DMA slave address from 'struct hpb_dmae_slave_config', so we have to add the 'slave_addr' field to 'struct hpb_dmae_chan', conditionally assign it in set_slave() method, and return in slave_addr() method. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Tested-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Vinod Koul <vinod.koul@intel.com>		2013-10-11 07:24:36 +05:30
..
Kconfig	Merge branch 'topic/sh' into for-linus	2013-09-02 17:42:35 +05:30
Makefile	Merge branch 'topic/sh' into for-linus	2013-09-02 17:42:35 +05:30
rcar-hpbdma.c	rcar-hpbdma: add parameter to set_slave() method	2013-10-11 07:24:36 +05:30
shdma-arm.h	DMA: shdma: add a header with common for ARM SoCs defines	2013-08-27 14:26:14 +05:30
shdma-base.c	DMA: shdma: switch DT mode to use configuration data from a match table	2013-08-27 14:25:09 +05:30
shdma-of.c	Merge branch 'topic/sh' into for-linus	2013-09-02 17:42:35 +05:30
shdma-r8a73a4.c	DMA: shdma: add r8a73a4 DMAC data to the device ID table	2013-08-27 14:26:21 +05:30
shdma.h	DMA: shdma: add r8a73a4 DMAC data to the device ID table	2013-08-27 14:26:21 +05:30
shdmac.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2013-09-10 13:37:36 -07:00
sudmac.c	Merge branch 'topic/sh' into for-linus	2013-09-02 17:42:35 +05:30