lkml.org 
[lkml]   [2013]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/2] dma: of: Remove restriction that #dma-cells can't be 0
On Mon, Apr 22, 2013 at 10:33:32AM +0200, Lars-Peter Clausen wrote:
> 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>
Applied, both thanks

Sorry looks like I missed applying them earlier...

--
~Vinod

> ---
> drivers/dma/of-dma.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
> index 7aa0864..268cc8a 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;
>
> --
> 1.8.0
>


\
 
 \ /
  Last update: 2013-05-23 13:41    [W:0.446 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site