Commit ff0e0f4f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Vinod Koul

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 317ddd25
...@@ -64,7 +64,6 @@ int of_dma_controller_register(struct device_node *np, ...@@ -64,7 +64,6 @@ int of_dma_controller_register(struct device_node *np,
void *data) void *data)
{ {
struct of_dma *ofdma; struct of_dma *ofdma;
int nbcells;
const __be32 *prop; const __be32 *prop;
if (!np || !of_dma_xlate) { if (!np || !of_dma_xlate) {
...@@ -77,18 +76,16 @@ int of_dma_controller_register(struct device_node *np, ...@@ -77,18 +76,16 @@ int of_dma_controller_register(struct device_node *np,
return -ENOMEM; return -ENOMEM;
prop = of_get_property(np, "#dma-cells", NULL); prop = of_get_property(np, "#dma-cells", NULL);
if (prop) if (!prop) {
nbcells = be32_to_cpup(prop); pr_err("%s: #dma-cells property is missing\n",
if (!prop || !nbcells) {
pr_err("%s: #dma-cells property is missing or invalid\n",
__func__); __func__);
kfree(ofdma); kfree(ofdma);
return -EINVAL; return -EINVAL;
} }
ofdma->of_node = np; 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_xlate = of_dma_xlate;
ofdma->of_dma_data = data; ofdma->of_dma_data = data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment