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

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

ASoC: DaVinci: Delete an error message for a failed memory allocation in two 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 5771a8c0

sound/soc/davinci/davinci-mcasp.c

+0 −2
Original line number Diff line number Diff line
@@ -1602,8 +1602,6 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( 
		pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata) {

			dev_err(&pdev->dev,

				"Failed to allocate memory for pdata\n");

			ret = -ENOMEM;

			return pdata;

		}

sound/soc/davinci/davinci-vcif.c

+1 −4
Original line number Diff line number Diff line
@@ -210,11 +210,8 @@ static int davinci_vcif_probe(struct platform_device *pdev) 
	davinci_vcif_dev = devm_kzalloc(&pdev->dev,

					sizeof(struct davinci_vcif_dev),

					GFP_KERNEL);

	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;