diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-11-10 05:13:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-18 18:08:16 +0000 |
| commit | 2ea2cc86db7c73dc4e3a9fc3232cb04fe1b1ab91 (patch) | |
| tree | 0da705dee76a9aa7db6dbc6d02b6b4953e643630 /sound/soc/sh/rcar/core.c | |
| parent | e797f58ead6069478e535ae62b180da87b28a84f (diff) | |
| download | linux-2ea2cc86db7c73dc4e3a9fc3232cb04fe1b1ab91.tar.bz2 | |
ASoC: rsnd: remove struct rcar_snd_info
No board is using Renesas sound driver via platform boot now.
This means all user is using DT boot. Platform boot support is
no longer needed. But, it strongly depends on platform boot style.
Now, platform boot style was removed from driver.
This is cleanup patch, and remove pointless struct rcar_snd_info
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/core.c')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 8b9d721acb41..8af166809629 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -108,13 +108,6 @@ static const struct of_device_id rsnd_of_match[] = { MODULE_DEVICE_TABLE(of, rsnd_of_match); /* - * rsnd_platform functions - */ -#define rsnd_platform_call(priv, dai, func, param...) \ - (!(priv->info->func) ? 0 : \ - priv->info->func(param)) - -/* * rsnd_mod functions */ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type) @@ -457,7 +450,6 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct rsnd_priv *priv = rsnd_dai_to_priv(dai); struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); - int ssi_id = rsnd_mod_id(rsnd_io_to_mod_ssi(io)); int ret; unsigned long flags; @@ -467,10 +459,6 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_START: rsnd_dai_stream_init(io, substream); - ret = rsnd_platform_call(priv, dai, start, ssi_id); - if (ret < 0) - goto dai_trigger_end; - ret = rsnd_dai_call(init, io, priv); if (ret < 0) goto dai_trigger_end; @@ -484,8 +472,6 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, ret |= rsnd_dai_call(quit, io, priv); - ret |= rsnd_platform_call(priv, dai, stop, ssi_id); - rsnd_dai_stream_quit(io); break; default: @@ -985,7 +971,6 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv, */ static int rsnd_probe(struct platform_device *pdev) { - struct rcar_snd_info *info; struct rsnd_priv *priv; struct device *dev = &pdev->dev; struct rsnd_dai *rdai; @@ -1006,11 +991,6 @@ static int rsnd_probe(struct platform_device *pdev) }; int ret, i; - info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info), - GFP_KERNEL); - if (!info) - return -ENOMEM; - /* * init priv data */ @@ -1021,7 +1001,6 @@ static int rsnd_probe(struct platform_device *pdev) } priv->pdev = pdev; - priv->info = info; priv->flags = (u32)of_id->data; spin_lock_init(&priv->lock); |