aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-01-23 18:40:47 -0800
committerMark Brown <broonie@linaro.org>2014-02-03 12:41:37 +0000
commit39cf3c4064b8db25efe501fec8e3c48a578b4b58 (patch)
tree9967ac40ee95a91688fad8925bb570c79c5b4b98 /sound/soc/sh
parentASoC: rsnd: clarify scu.c area (diff)
downloadlinux-dev-39cf3c4064b8db25efe501fec8e3c48a578b4b58.tar.xz
linux-dev-39cf3c4064b8db25efe501fec8e3c48a578b4b58.zip
ASoC: rsnd: Merge macros in scu.c
Merge #define lines, since these are defined in the scattering place Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/scu.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 1adc85825f4e..8181ec55ad21 100644
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -16,9 +16,6 @@ struct rsnd_scu {
struct clk *clk;
};
-#define rsnd_scu_mode_flags(p) ((p)->info->flags)
-#define rsnd_scu_convert_rate(p) ((p)->info->convert_rate)
-
#define RSND_SCU_NAME_SIZE 16
/*
@@ -30,6 +27,18 @@ struct rsnd_scu {
#define OTBL_18 (6 << 16)
#define OTBL_16 (8 << 16)
+#define rsnd_scu_mode_flags(p) ((p)->info->flags)
+#define rsnd_scu_convert_rate(p) ((p)->info->convert_rate)
+#define rsnd_mod_to_scu(_mod) \
+ container_of((_mod), struct rsnd_scu, mod)
+
+#define for_each_rsnd_scu(pos, priv, i) \
+ for ((i) = 0; \
+ ((i) < rsnd_scu_nr(priv)) && \
+ ((pos) = (struct rsnd_scu *)(priv)->scu + i); \
+ i++)
+
+
/*
* image of SRC (Sampling Rate Converter)
*
@@ -99,15 +108,6 @@ struct rsnd_scu {
*
*/
-#define rsnd_mod_to_scu(_mod) \
- container_of((_mod), struct rsnd_scu, mod)
-
-#define for_each_rsnd_scu(pos, priv, i) \
- for ((i) = 0; \
- ((i) < rsnd_scu_nr(priv)) && \
- ((pos) = (struct rsnd_scu *)(priv)->scu + i); \
- i++)
-
static int rsnd_scu_ssi_mode_init(struct rsnd_mod *mod,
struct rsnd_dai *rdai,
struct rsnd_dai_stream *io)