diff options
Diffstat (limited to 'patches.renesas/0127-ASoC-rsnd-move-rsnd_mod_is_working-to-rsnd_io_is_wor.patch')
| -rw-r--r-- | patches.renesas/0127-ASoC-rsnd-move-rsnd_mod_is_working-to-rsnd_io_is_wor.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/patches.renesas/0127-ASoC-rsnd-move-rsnd_mod_is_working-to-rsnd_io_is_wor.patch b/patches.renesas/0127-ASoC-rsnd-move-rsnd_mod_is_working-to-rsnd_io_is_wor.patch deleted file mode 100644 index dcb39115e47832..00000000000000 --- a/patches.renesas/0127-ASoC-rsnd-move-rsnd_mod_is_working-to-rsnd_io_is_wor.patch +++ /dev/null @@ -1,103 +0,0 @@ -From b6037cfa54af64234384837621516a912f269996 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Mon, 15 Jun 2015 06:27:47 +0000 -Subject: [PATCH 127/129] ASoC: rsnd: move rsnd_mod_is_working() to - rsnd_io_is_working() - -Each Renesas sound mod (= SSI/SRC/DVC) might be called from many paths -if it supports MIXer. In such case, mod <-> io is no longer 1:1 -relationship. -This patch checks module working status via io instead of mod - -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> -(cherry picked from commit d5bbe7de563ccce62765f1183561218b6dbdbe1e) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/core.c | 4 +--- - sound/soc/sh/rcar/dma.c | 2 +- - sound/soc/sh/rcar/rsnd.h | 3 +-- - sound/soc/sh/rcar/src.c | 2 +- - sound/soc/sh/rcar/ssi.c | 2 +- - 5 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c -index 266b24ae621d..1eca85ff3e91 100644 ---- a/sound/soc/sh/rcar/core.c -+++ b/sound/soc/sh/rcar/core.c -@@ -196,10 +196,8 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod, - } - } - --int rsnd_mod_is_working(struct rsnd_mod *mod) -+int rsnd_io_is_working(struct rsnd_dai_stream *io) - { -- struct rsnd_dai_stream *io = rsnd_mod_to_io(mod); -- - /* see rsnd_dai_stream_init/quit() */ - return !!io->substream; - } -diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c -index 48b87bb10322..d306e298c63d 100644 ---- a/sound/soc/sh/rcar/dma.c -+++ b/sound/soc/sh/rcar/dma.c -@@ -52,7 +52,7 @@ static void __rsnd_dmaen_complete(struct rsnd_mod *mod, - */ - spin_lock_irqsave(&priv->lock, flags); - -- if (rsnd_mod_is_working(mod)) -+ if (rsnd_io_is_working(io)) - elapsed = rsnd_dai_pointer_update(io, io->byte_per_period); - - spin_unlock_irqrestore(&priv->lock, flags); -diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h -index fdb443b4f183..756930bc1914 100644 ---- a/sound/soc/sh/rcar/rsnd.h -+++ b/sound/soc/sh/rcar/rsnd.h -@@ -326,7 +326,6 @@ int rsnd_mod_init(struct rsnd_priv *priv, - int id); - void rsnd_mod_quit(struct rsnd_mod *mod); - char *rsnd_mod_name(struct rsnd_mod *mod); --int rsnd_mod_is_working(struct rsnd_mod *mod); - struct dma_chan *rsnd_mod_dma_req(struct rsnd_dai_stream *io, - struct rsnd_mod *mod); - void rsnd_mod_interrupt(struct rsnd_mod *mod, -@@ -356,7 +355,7 @@ struct rsnd_dai_stream { - #define rsnd_io_is_play(io) (&rsnd_io_to_rdai(io)->playback == io) - #define rsnd_io_to_runtime(io) ((io)->substream ? \ - (io)->substream->runtime : NULL) -- -+int rsnd_io_is_working(struct rsnd_dai_stream *io); - - struct rsnd_dai { - char name[RSND_DAI_NAME_SIZE]; -diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c -index 67db69686515..c61c17180142 100644 ---- a/sound/soc/sh/rcar/src.c -+++ b/sound/soc/sh/rcar/src.c -@@ -684,7 +684,7 @@ static void __rsnd_src_interrupt_gen2(struct rsnd_mod *mod, - spin_lock(&priv->lock); - - /* ignore all cases if not working */ -- if (!rsnd_mod_is_working(mod)) -+ if (!rsnd_io_is_working(io)) - goto rsnd_src_interrupt_gen2_out; - - if (rsnd_src_error_record_gen2(mod)) { -diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c -index fa1f2e5b9070..2fbe59f7f9b5 100644 ---- a/sound/soc/sh/rcar/ssi.c -+++ b/sound/soc/sh/rcar/ssi.c -@@ -432,7 +432,7 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, - spin_lock(&priv->lock); - - /* ignore all cases if not working */ -- if (!rsnd_mod_is_working(mod)) -+ if (!rsnd_io_is_working(io)) - goto rsnd_ssi_interrupt_out; - - status = rsnd_mod_read(mod, SSISR); --- -2.6.2 - |