Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 443be77e authored by Markus Elfring's avatar Markus Elfring Committed by Mark Brown
Browse files

ASoC: Freescale: Delete an error message for a failed memory allocation in three functions 

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf


Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 779238e2

sound/soc/fsl/fsl_asrc_dma.c

+1 −3
Original line number Diff line number Diff line
@@ -279,10 +279,8 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream) 
	struct fsl_asrc_pair *pair;



	pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);

	if (!pair) {

		dev_err(dev, "failed to allocate pair\n");

	if (!pair)

		return -ENOMEM;

	}



	pair->asrc_priv = asrc_priv;

sound/soc/fsl/fsl_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -905,7 +905,6 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) 


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

	if (!dma) {

		dev_err(&pdev->dev, "could not allocate dma object\n");

		of_node_put(ssi_np);

		return -ENOMEM;

	}

sound/soc/fsl/fsl_ssi.c

+1 −3
Original line number Diff line number Diff line
@@ -1432,10 +1432,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) 


	ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),

			GFP_KERNEL);

	if (!ssi_private) {

		dev_err(&pdev->dev, "could not allocate DAI object\n");

	if (!ssi_private)

		return -ENOMEM;

	}



	ssi_private->soc = of_id->data;

	ssi_private->dev = &pdev->dev;