summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-04-22 10:33:32 +0200
committerVinod Koul <vinod.koul@intel.com>2013-06-12 07:49:19 +0530
commitff0e0f4f568e8d7593e0035c0c58067bcaf4ab07 (patch)
treeb0201097850ea0f27b5f427e9208860759cd9263
parent317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff)
downloadlinux-stable-ff0e0f4f568e8d7593e0035c0c58067bcaf4ab07.tar.gz
linux-stable-ff0e0f4f568e8d7593e0035c0c58067bcaf4ab07.tar.bz2
linux-stable-ff0e0f4f568e8d7593e0035c0c58067bcaf4ab07.zip
dma: of: Remove restriction that #dma-cells can't be 0
There is no sensible reason why #dma-cells shouldn't be allowed to be 0. It is completely up to the DMA controller how many additional parameters, besides the phandle, it needs to identify a channel. E.g. for DMA controller with only one channel or for DMA controllers which don't have a restriction on which channel can be used for which peripheral it completely legitimate to not require any additional parameters. Also fixes the following warning: drivers/dma/of-dma.c: In function 'of_dma_controller_register': drivers/dma/of-dma.c:67:7: warning: 'nbcells' may be used uninitialized in this function Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/of-dma.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 7aa0864cd487..268cc8ab34e8 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -64,7 +64,6 @@ int of_dma_controller_register(struct device_node *np,
void *data)
{
struct of_dma *ofdma;
- int nbcells;
const __be32 *prop;
if (!np || !of_dma_xlate) {
@@ -77,18 +76,16 @@ int of_dma_controller_register(struct device_node *np,
return -ENOMEM;
prop = of_get_property(np, "#dma-cells", NULL);
- if (prop)
- nbcells = be32_to_cpup(prop);
-
- if (!prop || !nbcells) {
- pr_err("%s: #dma-cells property is missing or invalid\n",
+ if (!prop) {
+ pr_err("%s: #dma-cells property is missing\n",
__func__);
kfree(ofdma);
return -EINVAL;
}
+
ofdma->of_node = np;
- ofdma->of_dma_nbcells = nbcells;
+ ofdma->of_dma_nbcells = be32_to_cpup(prop);
ofdma->of_dma_xlate = of_dma_xlate;
ofdma->of_dma_data = data;