diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-09-25 22:31:37 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-11 01:54:36 (GMT) |
| commit | 08d08bcdee30d3a28426bd60dfbdae44b36250bc (patch) | |
| tree | bd2ab50c2c4deb05b5f5550051c46b6570b57649 /drivers/clk/clk-ls1x.c | |
| parent | cdeb5c033f0389c44e5b36cafd623bdf44bbe25c (diff) | |
| download | linux-fsl-qoriq-08d08bcdee30d3a28426bd60dfbdae44b36250bc.tar.xz | |
rcar-hpbdma: add parameter to set_slave() method
Commit 4981c4dc194efb18f0e9a02f1b43e926f2f0d2bb (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 c4f6c41ba790bbbfcebb4c47a
(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>
Diffstat (limited to 'drivers/clk/clk-ls1x.c')
0 files changed, 0 insertions, 0 deletions