]> git.baikalelectronics.ru Git - kernel.git/commit
rcar-hpbdma: add parameter to set_slave() method
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Wed, 25 Sep 2013 22:31:37 +0000 (02:31 +0400)
committerVinod Koul <vinod.koul@intel.com>
Fri, 11 Oct 2013 01:54:36 +0000 (07:24 +0530)
commit1b8f40e7d64812368b005391257b9e23a29796dc
treebd2ab50c2c4deb05b5f5550051c46b6570b57649
parente4b7e61529ba5f4df33f03592e30ac2abb2e088b
rcar-hpbdma: add parameter to set_slave() method

Commit 3bdbcc0fc174c29c785449545062e0522957df93 (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 8820957d295fec50c0398a680
(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>
drivers/dma/sh/rcar-hpbdma.c