aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-02-14 04:00:19 -0500
committerVinod Koul <vinod.koul@intel.com>2013-02-14 09:30:53 -0500
commit373459eee0cd79f775ef9874395bb37638154777 (patch)
tree850b828d96f39bf3f04ee4a05a540b0438c18060 /drivers/dma
parent9b562639a1dbef847dfc9daa807bd3e7e02ef24f (diff)
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.c6
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;
620static const struct platform_device_info edma_dev_info0 = { 620static const struct platform_device_info edma_dev_info0 = {
621 .name = "edma-dma-engine", 621 .name = "edma-dma-engine",
622 .id = 0, 622 .id = 0,
623 .dma_mask = DMA_BIT_MASK(32),
624}; 623};
625 624
626static const struct platform_device_info edma_dev_info1 = { 625static const struct platform_device_info edma_dev_info1 = {
627 .name = "edma-dma-engine", 626 .name = "edma-dma-engine",
628 .id = 1, 627 .id = 1,
629 .dma_mask = DMA_BIT_MASK(32),
630}; 628};
631 629
632static int edma_init(void) 630static int edma_init(void)
@@ -640,6 +638,8 @@ static int edma_init(void)
640 ret = PTR_ERR(pdev0); 638 ret = PTR_ERR(pdev0);
641 goto out; 639 goto out;
642 } 640 }
641 pdev0->dev.dma_mask = &pdev0->dev.coherent_dma_mask;
642 pdev0->dev.coherent_dma_mask = DMA_BIT_MASK(32);
643 } 643 }
644 644
645 if (EDMA_CTLRS == 2) { 645 if (EDMA_CTLRS == 2) {
@@ -649,6 +649,8 @@ static int edma_init(void)
649 platform_device_unregister(pdev0); 649 platform_device_unregister(pdev0);
650 ret = PTR_ERR(pdev1); 650 ret = PTR_ERR(pdev1);
651 } 651 }
652 pdev1->dev.dma_mask = &pdev1->dev.coherent_dma_mask;
653 pdev1->dev.coherent_dma_mask = DMA_BIT_MASK(32);
652 } 654 }
653 655
654out: 656out: