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

Commit dcc448e6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

ASoC: rsnd: Remove obsolete platform data support 



Since commit 3d7608e4 ("ARM: shmobile: bockw: remove legacy
board file and config"), Renesas R-Car SoCs are only supported in
generic DT-only ARM multi-platform builds.  The driver doesn't need to
use platform data anymore, hence remove platform data configuration.

Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed
by platform code.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 462c30bc

sound/soc/sh/rcar/core.c

+5 −14
Original line number Diff line number Diff line
@@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev) 
	};

	int ret, i;



	info = NULL;

	of_data = NULL;

	if (of_id) {

		info = devm_kzalloc(&pdev->dev,

				    sizeof(struct rcar_snd_info), GFP_KERNEL);

	info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info),

			    GFP_KERNEL);

	if (!info)

		return -ENOMEM;

	of_data = of_id->data;

	} else {

		info = pdev->dev.platform_data;

	}



	if (!info) {

		dev_err(dev, "driver needs R-Car sound information\n");

		return -ENODEV;

	}



	/*

	 *	init priv data

include/sound/rcar_snd.h→sound/soc/sh/rcar/rcar_snd.h

+0 −0

File moved.

View file

sound/soc/sh/rcar/rsnd.h

+2 −1
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ 
#include <linux/of_irq.h>

#include <linux/sh_dma.h>

#include <linux/workqueue.h>

#include <sound/rcar_snd.h>

#include <sound/soc.h>

#include <sound/pcm_params.h>



#include "rcar_snd.h"



/*

 *	pseudo register

 *

sound/soc/sh/rcar/ssi.c

+0 −3
Original line number Diff line number Diff line
@@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, 
	struct device *dev = &pdev->dev;

	int nr, i;



	if (!of_data)

		return;



	node = rsnd_ssi_of_node(priv);

	if (!node)

		return;