| From 2f2c00ce9b9915cc70995ecdee13a059a70ef6d4 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 19 Apr 2017 00:41:24 +0000 |
| Subject: [PATCH 098/286] ASoC: rsnd: rsnd_mod_make_sure() is not under DEBUG |
| |
| rsnd_mod_make_sure() will be used any situation, |
| thus, under DEBUG is not realistic. |
| This patch move it to non DEBUG area |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit 9ca5e57d78446c8bd42adff3dcae693703f91d9c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 2 -- |
| sound/soc/sh/rcar/rsnd.h | 2 +- |
| 2 files changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -110,7 +110,6 @@ MODULE_DEVICE_TABLE(of, rsnd_of_match); |
| /* |
| * rsnd_mod functions |
| */ |
| -#ifdef DEBUG |
| void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type) |
| { |
| if (mod->type != type) { |
| @@ -121,7 +120,6 @@ void rsnd_mod_make_sure(struct rsnd_mod |
| rsnd_mod_name(mod), rsnd_mod_id(mod)); |
| } |
| } |
| -#endif |
| |
| char *rsnd_mod_name(struct rsnd_mod *mod) |
| { |
| --- a/sound/soc/sh/rcar/rsnd.h |
| +++ b/sound/soc/sh/rcar/rsnd.h |
| @@ -727,8 +727,8 @@ void rsnd_cmd_remove(struct rsnd_priv *p |
| int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id); |
| struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id); |
| |
| -#ifdef DEBUG |
| void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type); |
| +#ifdef DEBUG |
| #define rsnd_mod_confirm_ssi(mssi) rsnd_mod_make_sure(mssi, RSND_MOD_SSI) |
| #define rsnd_mod_confirm_src(msrc) rsnd_mod_make_sure(msrc, RSND_MOD_SRC) |
| #define rsnd_mod_confirm_dvc(mdvc) rsnd_mod_make_sure(mdvc, RSND_MOD_DVC) |
