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

Commit d7a6fe01 authored Jan 06, 2015 by Alexandre Belloni Committed by Mark Brown Mar 02, 2015

ASoC: sam9g20_wm8731: drop machine_is_xxx



Atmel based boards can now only be used with device tree. Drop non DT
initialization.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent c517d838

sound/soc/atmel/sam9g20_wm8731.c

+31 −37

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@
		#include <sound/pcm_params.h>
		#include <sound/soc.h>

		#include <asm/mach-types.h>

		#include "../codecs/wm8731.h"
		#include "atmel-pcm.h"
		#include "atmel_ssc_dai.h"
		@@ -171,8 +169,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
		int ret;

		if (!np) {
		if (!(machine_is_at91sam9g20ek() \|\|
		machine_is_at91sam9g20ek_2mmc()))
		return -ENODEV;
		}

		@@ -210,7 +206,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
		card->dev = &pdev->dev;

		/* Parse device node info */
		if (np) {
		ret = snd_soc_of_parse_card_name(card, "atmel,model");
		if (ret)
		goto err;
		@@ -242,7 +237,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)

		of_node_put(codec_np);
		of_node_put(cpu_np);
		}

		ret = snd_soc_register_card(card);
		if (ret) {