diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2013-02-14 11:00:19 +0200 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2013-02-14 20:00:53 +0530 |
| commit | 373459eee0cd79f775ef9874395bb37638154777 (patch) | |
| tree | 850b828d96f39bf3f04ee4a05a540b0438c18060 /drivers/dma | |
| parent | dma: coh901318: set residue only if dma is in progress (diff) | |
| download | linux-dev-373459eee0cd79f775ef9874395bb37638154777.tar.xz linux-dev-373459eee0cd79f775ef9874395bb37638154777.zip | |
edma: do not waste memory for dma_mask
Accordingly to commentary in the platform_device_register_full the memory
allocated for dma_mask will not going to be freed. That's why is better to
assign dma_mask afterwards.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/edma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 82c8672f26e8..af44cadb8de1 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -620,13 +620,11 @@ static struct platform_device *pdev0, *pdev1; static const struct platform_device_info edma_dev_info0 = { .name = "edma-dma-engine", .id = 0, - .dma_mask = DMA_BIT_MASK(32), }; static const struct platform_device_info edma_dev_info1 = { .name = "edma-dma-engine", .id = 1, - .dma_mask = DMA_BIT_MASK(32), }; static int edma_init(void) @@ -640,6 +638,8 @@ static int edma_init(void) ret = PTR_ERR(pdev0); goto out; } + pdev0->dev.dma_mask = &pdev0->dev.coherent_dma_mask; + pdev0->dev.coherent_dma_mask = DMA_BIT_MASK(32); } if (EDMA_CTLRS == 2) { @@ -649,6 +649,8 @@ static int edma_init(void) platform_device_unregister(pdev0); ret = PTR_ERR(pdev1); } + pdev1->dev.dma_mask = &pdev1->dev.coherent_dma_mask; + pdev1->dev.coherent_dma_mask = DMA_BIT_MASK(32); } out: |