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

ASoC: rsnd: 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 b6e58fca

sound/soc/sh/rcar/adg.c

+1 −3
Original line number Diff line number Diff line
@@ -586,10 +586,8 @@ int rsnd_adg_probe(struct rsnd_priv *priv) 
	int ret;



	adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);

	if (!adg) {

		dev_err(dev, "ADG allocate failed\n");

	if (!adg)

		return -ENOMEM;

	}



	ret = rsnd_mod_init(priv, &adg->mod, &adg_ops,

		      NULL, NULL, 0, 0);

sound/soc/sh/rcar/core.c

+1 −3
Original line number Diff line number Diff line
@@ -1401,10 +1401,8 @@ static int rsnd_probe(struct platform_device *pdev) 
	 *	init priv data

	 */

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		dev_err(dev, "priv allocate failed\n");

	if (!priv)

		return -ENODEV;

	}



	priv->pdev	= pdev;

	priv->flags	= (unsigned long)of_device_get_match_data(dev);

sound/soc/sh/rcar/gen.c

+1 −3
Original line number Diff line number Diff line
@@ -406,10 +406,8 @@ int rsnd_gen_probe(struct rsnd_priv *priv) 
	int ret;



	gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL);

	if (!gen) {

		dev_err(dev, "GEN allocate failed\n");

	if (!gen)

		return -ENOMEM;

	}



	priv->gen = gen;

CRA Git | Maintained and supported by SUSTech CRA and CCSE