On 01/07/2015 06:21 PM, Fabio Estevam wrote:

From: Fabio Estevam fabio.estevam@freescale.com

The only usage of 'full_name' is inside an error message, which provides a rather verbose node path.

A more concise error message can be obtained by using 'pdev->name' instead.

It's probably best to drop it altogether in that case. dev_err() already prints the name of the device.

It

also makes the kzalloc calculation simpler, as we don't need to take the length of full_name into account.

Signed-off-by: Fabio Estevam fabio.estevam@freescale.com

Buit tested only.

sound/soc/fsl/fsl_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 026da0a..770de20 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -897,12 +897,12 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) ret = of_address_to_resource(ssi_np, 0, &res); if (ret) { dev_err(&pdev->dev, "could not determine resources for %s\n",

• 	ssi_np->full_name);
  

• 	pdev->name);
  

  of_node_put(ssi_np); return ret; }

• dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL);

• dma = kzalloc(sizeof(*dma), GFP_KERNEL);

This should probably be part of patch 1.

if (!dma) { dev_err(&pdev->dev, "could not allocate dma object\n"); of_node_put(ssi_np);

On Wed, Jan 7, 2015 at 3:27 PM, Timur Tabi timur@tabi.org wrote:

Lars-Peter Clausen wrote:

...

...

• dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL);

• dma = kzalloc(sizeof(*dma), GFP_KERNEL);

This should probably be part of patch 1.

I think you're right.

Thanks, so I can do it on a single patch then:

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 93d7e56..72e7979 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -63,7 +63,6 @@ struct dma_object { struct ccsr_dma_channel __iomem *channel; unsigned int irq; bool assigned; - char path[1]; };

/* @@ -897,20 +896,18 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)

ret = of_address_to_resource(ssi_np, 0, &res); if (ret) { - dev_err(&pdev->dev, "could not determine resources for %s\n", - ssi_np->full_name); + dev_err(&pdev->dev, "could not determine resources: %d\n", ret); of_node_put(ssi_np); return ret; }

- dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL); + dma = kzalloc(sizeof(*dma), GFP_KERNEL); if (!dma) { dev_err(&pdev->dev, "could not allocate dma object\n"); of_node_put(ssi_np); return -ENOMEM; }

- strcpy(dma->path, np->full_name); dma->dai.ops = &fsl_dma_ops; dma->dai.pcm_new = fsl_dma_new; dma->dai.pcm_free = fsl_dma_free_dma_buffers;