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

Commit 7722f830 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mark Brown
Browse files

ASoC: simple-card: simplify code 



The check of the mandatory fields is done for DT in its specific sequence.
Move the global check to the non-DT sequence.

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

sound/soc/generic/simple-card.c

+9 −9
Original line number Diff line number Diff line
@@ -225,17 +225,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 


		memcpy(cinfo, dev->platform_data, sizeof(*cinfo));

		cinfo->snd_card.dev = dev;

	}



		if (!cinfo->name	||

		    !cinfo->card	||

		    !cinfo->codec_dai.name	||

	    !(cinfo->codec		|| of_codec)	||

	    !(cinfo->platform		|| of_platform)	||

	    !(cinfo->cpu_dai.name	|| of_cpu)) {

		    !cinfo->codec	||

		    !cinfo->platform	||

		    !cinfo->cpu_dai.name) {

			dev_err(dev, "insufficient asoc_simple_card_info settings\n");

			return -EINVAL;

		}

	}



	/*

	 * init snd_soc_dai_link