diff options
Diffstat (limited to 'drivers/dma/sirf-dma.c')
-rw-r--r-- | drivers/dma/sirf-dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index aac03ab10c54..feb1e8ab8d7b 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c | |||
@@ -735,7 +735,6 @@ static int sirfsoc_dma_probe(struct platform_device *op) | |||
735 | 735 | ||
736 | dma = &sdma->dma; | 736 | dma = &sdma->dma; |
737 | dma->dev = dev; | 737 | dma->dev = dev; |
738 | dma->chancnt = SIRFSOC_DMA_CHANNELS; | ||
739 | 738 | ||
740 | dma->device_alloc_chan_resources = sirfsoc_dma_alloc_chan_resources; | 739 | dma->device_alloc_chan_resources = sirfsoc_dma_alloc_chan_resources; |
741 | dma->device_free_chan_resources = sirfsoc_dma_free_chan_resources; | 740 | dma->device_free_chan_resources = sirfsoc_dma_free_chan_resources; |
@@ -752,7 +751,7 @@ static int sirfsoc_dma_probe(struct platform_device *op) | |||
752 | dma_cap_set(DMA_INTERLEAVE, dma->cap_mask); | 751 | dma_cap_set(DMA_INTERLEAVE, dma->cap_mask); |
753 | dma_cap_set(DMA_PRIVATE, dma->cap_mask); | 752 | dma_cap_set(DMA_PRIVATE, dma->cap_mask); |
754 | 753 | ||
755 | for (i = 0; i < dma->chancnt; i++) { | 754 | for (i = 0; i < SIRFSOC_DMA_CHANNELS; i++) { |
756 | schan = &sdma->channels[i]; | 755 | schan = &sdma->channels[i]; |
757 | 756 | ||
758 | schan->chan.device = dma; | 757 | schan->chan.device = dma; |
@@ -835,6 +834,7 @@ static int sirfsoc_dma_runtime_resume(struct device *dev) | |||
835 | return 0; | 834 | return 0; |
836 | } | 835 | } |
837 | 836 | ||
837 | #ifdef CONFIG_PM_SLEEP | ||
838 | static int sirfsoc_dma_pm_suspend(struct device *dev) | 838 | static int sirfsoc_dma_pm_suspend(struct device *dev) |
839 | { | 839 | { |
840 | struct sirfsoc_dma *sdma = dev_get_drvdata(dev); | 840 | struct sirfsoc_dma *sdma = dev_get_drvdata(dev); |
@@ -916,6 +916,7 @@ static int sirfsoc_dma_pm_resume(struct device *dev) | |||
916 | 916 | ||
917 | return 0; | 917 | return 0; |
918 | } | 918 | } |
919 | #endif | ||
919 | 920 | ||
920 | static const struct dev_pm_ops sirfsoc_dma_pm_ops = { | 921 | static const struct dev_pm_ops sirfsoc_dma_pm_ops = { |
921 | SET_RUNTIME_PM_OPS(sirfsoc_dma_runtime_suspend, sirfsoc_dma_runtime_resume, NULL) | 922 | SET_RUNTIME_PM_OPS(sirfsoc_dma_runtime_suspend, sirfsoc_dma_runtime_resume, NULL) |