public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Vinod Koul <vinod.koul@intel.com>,
	linux-kernel@vger.kernel.org,
	Viresh Kumar <viresh.kumar@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH 5/6] edma: do not waste memory for dma_mask
Date: Tue, 12 Feb 2013 12:58:38 +0200	[thread overview]
Message-ID: <1360666720-19006-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1360666720-19006-1-git-send-email-andriy.shevchenko@linux.intel.com>

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>
---
 drivers/dma/edma.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 06ea4b8..cd7e328 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:
-- 
1.7.10.4


  parent reply	other threads:[~2013-02-12 10:59 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-12 10:58 [PATCH 0/6] dma: various fixes in different DMAC drivers Andy Shevchenko
2013-02-12 10:58 ` [PATCH 1/6] of: dma: protect list write operation by spin_lock Andy Shevchenko
2013-02-12 10:58 ` [PATCH 2/6] dmaengine.h: remove redundant else keyword Andy Shevchenko
2013-02-12 15:01   ` Viresh Kumar
2013-02-12 10:58 ` [PATCH 3/6] dma: coh901318_lli: avoid unbalanced locking Andy Shevchenko
2013-02-12 15:57   ` Viresh Kumar
2013-02-15 14:52   ` Linus Walleij
2013-02-15 14:56     ` Andy Shevchenko
2013-02-15 20:52       ` Linus Walleij
2013-02-12 10:58 ` [PATCH 4/6] dma: coh901318_lli: set residue only if dma is in progress Andy Shevchenko
2013-02-15 14:53   ` Linus Walleij
2013-02-12 10:58 ` Andy Shevchenko [this message]
2013-02-12 10:58 ` [PATCH 6/6] dma: tegra20-apb-dma: remove unnecessary assignment Andy Shevchenko
2013-02-13 12:40   ` Laxman Dewangan
2013-02-12 16:02 ` [PATCH 0/6] dma: various fixes in different DMAC drivers Viresh Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360666720-19006-6-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vinod.koul@intel.com \
    --cc=viresh.kumar@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox