Browse Source

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: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
Markus Elfring 8 years ago
parent
commit
443be77e4b
3 changed files with 2 additions and 7 deletions
  1. 1 3
      sound/soc/fsl/fsl_asrc_dma.c
  2. 0 1
      sound/soc/fsl/fsl_dma.c
  3. 1 3
      sound/soc/fsl/fsl_ssi.c

+ 1 - 3
sound/soc/fsl/fsl_asrc_dma.c

@@ -279,10 +279,8 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream)
 	struct fsl_asrc_pair *pair;
 	struct fsl_asrc_pair *pair;
 
 
 	pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);
 	pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);
-	if (!pair) {
-		dev_err(dev, "failed to allocate pair\n");
+	if (!pair)
 		return -ENOMEM;
 		return -ENOMEM;
-	}
 
 
 	pair->asrc_priv = asrc_priv;
 	pair->asrc_priv = asrc_priv;
 
 

+ 0 - 1
sound/soc/fsl/fsl_dma.c

@@ -905,7 +905,6 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
 
 
 	dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL);
 	dma = kzalloc(sizeof(*dma) + strlen(np->full_name), GFP_KERNEL);
 	if (!dma) {
 	if (!dma) {
-		dev_err(&pdev->dev, "could not allocate dma object\n");
 		of_node_put(ssi_np);
 		of_node_put(ssi_np);
 		return -ENOMEM;
 		return -ENOMEM;
 	}
 	}

+ 1 - 3
sound/soc/fsl/fsl_ssi.c

@@ -1432,10 +1432,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 
 
 	ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),
 	ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),
 			GFP_KERNEL);
 			GFP_KERNEL);
-	if (!ssi_private) {
-		dev_err(&pdev->dev, "could not allocate DAI object\n");
+	if (!ssi_private)
 		return -ENOMEM;
 		return -ENOMEM;
-	}
 
 
 	ssi_private->soc = of_id->data;
 	ssi_private->soc = of_id->data;
 	ssi_private->dev = &pdev->dev;
 	ssi_private->dev = &pdev->dev;