diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 17:42:35 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 17:42:35 +0530 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /drivers/dma/sh/sudmac.c | |
| parent | 592745e2f8afbaeafcf72645f0a2b0285644e091 (diff) | |
| parent | e5ffa401eacd0e74178e20ba932200fc9fe41c07 (diff) | |
| download | op-kernel-dev-265d9c673d47fcd5812d69dc07104b706285de56.zip op-kernel-dev-265d9c673d47fcd5812d69dc07104b706285de56.tar.gz | |
Merge branch 'topic/sh' into for-linus
Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh/sudmac.c')
| -rw-r--r-- | drivers/dma/sh/sudmac.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c index 8369c6f0..c7e9cdf 100644 --- a/drivers/dma/sh/sudmac.c +++ b/drivers/dma/sh/sudmac.c @@ -150,7 +150,8 @@ static const struct sudmac_slave_config *sudmac_find_slave( return NULL; } -static int sudmac_set_slave(struct shdma_chan *schan, int slave_id, bool try) +static int sudmac_set_slave(struct shdma_chan *schan, int slave_id, + dma_addr_t slave_addr, bool try) { struct sudmac_chan *sc = to_chan(schan); const struct sudmac_slave_config *cfg = sudmac_find_slave(sc, slave_id); @@ -298,11 +299,8 @@ static void sudmac_chan_remove(struct sudmac_device *su_dev) int i; shdma_for_each_chan(schan, &su_dev->shdma_dev, i) { - struct sudmac_chan *sc = to_chan(schan); - BUG_ON(!schan); - shdma_free_irq(&sc->shdma_chan); shdma_chan_remove(schan); } dma_dev->chancnt = 0; @@ -393,7 +391,6 @@ static int sudmac_probe(struct platform_device *pdev) chan_probe_err: sudmac_chan_remove(su_dev); - platform_set_drvdata(pdev, NULL); shdma_cleanup(&su_dev->shdma_dev); return err; @@ -407,7 +404,6 @@ static int sudmac_remove(struct platform_device *pdev) dma_async_device_unregister(dma_dev); sudmac_chan_remove(su_dev); shdma_cleanup(&su_dev->shdma_dev); - platform_set_drvdata(pdev, NULL); return 0; } |
