From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
ALSA SoC is now supporting "no Platform". Sound card doesn't need to select "CPU component" as "Platform" anymore if it doesn't need special Platform. This patch removes such settings.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/atmel/mikroe-proto.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index 255168a..5335ca0 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -88,8 +88,8 @@ static int snd_proto_probe(struct platform_device *pdev) if (!dai) return -ENOMEM;
- /* for cpus/codecs/platforms */ - comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL); + /* for cpus/codecs */ + comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL); if (!comp) return -ENOMEM;
@@ -100,8 +100,6 @@ static int snd_proto_probe(struct platform_device *pdev) dai->num_cpus = 1; dai->codecs = &comp[1]; dai->num_codecs = 1; - dai->platforms = &comp[2]; - dai->num_platforms = 1;
dai->name = "WM8731"; dai->stream_name = "WM8731 HiFi"; @@ -121,7 +119,6 @@ static int snd_proto_probe(struct platform_device *pdev) return -EINVAL; } dai->cpus->of_node = cpu_np; - dai->platforms->of_node = cpu_np;
dai_fmt = snd_soc_of_parse_daifmt(np, NULL, &bitclkmaster, &framemaster);