[PATCH] ASoC: DaVinci: Delete an error message for a failed memory allocation in two functions

From: SF Markus Elfring
Date: Fri Aug 11 2017 - 11:09:34 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 11 Aug 2017 16:51:46 +0200

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@xxxxxxxxxxxxxxxxxxxxx>
---
sound/soc/davinci/davinci-mcasp.c | 2 --
sound/soc/davinci/davinci-vcif.c | 5 +----
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 56ec1d301ac2..d486908d4e0e 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1604,6 +1604,4 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
if (!pdata) {
- dev_err(&pdev->dev,
- "Failed to allocate memory for pdata\n");
ret = -ENOMEM;
return pdata;
}
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index c77d9218795a..5415b72393fa 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -213,8 +213,5 @@ static int davinci_vcif_probe(struct platform_device *pdev)
- if (!davinci_vcif_dev) {
- dev_dbg(&pdev->dev,
- "could not allocate memory for private data\n");
+ if (!davinci_vcif_dev)
return -ENOMEM;
- }

/* DMA tx params */
davinci_vcif_dev->davinci_vc = davinci_vc;
--
2.14.0