2 files changed, 7 insertions, 7 deletions

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 2935bbf1811b..9430097979a5 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -21,6 +21,7 @@ struct rsnd_adg {
 
         int rate_of_441khz_div_6;
         int rate_of_48khz_div_6;
+        u32 ckr;
 };
 
 #define for_each_rsnd_clk(pos, adg, i)          \
@@ -115,6 +116,11 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate)
 
 found_clock:
 
+        /* see rsnd_adg_ssi_clk_init() */
+        rsnd_mod_bset(mod, SSICKR, 0x00FF0000, adg->ckr);
+        rsnd_mod_write(mod, BRRA,  0x00000002); /* 1/6 */
+        rsnd_mod_write(mod, BRRB,  0x00000002); /* 1/6 */
+
         /*
          * This "mod" = "ssi" here.
          * we can get "ssi id" from mod
@@ -181,9 +187,7 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg)
                 }
         }
 
-        rsnd_priv_bset(priv, SSICKR, 0x00FF0000, ckr);
-        rsnd_priv_write(priv, BRRA,  0x00000002); /* 1/6 */
-        rsnd_priv_write(priv, BRRB,  0x00000002); /* 1/6 */
+        adg->ckr = ckr;
 }
 
 int rsnd_adg_probe(struct platform_device *pdev,
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9cc6986a8cfb..3868aaf41cc4 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -78,10 +78,6 @@ struct rsnd_dai_stream;
 #define rsnd_mod_bset(m, r, s, d) \
         rsnd_bset(rsnd_mod_to_priv(m), m, RSND_REG_##r, s, d)
 
-#define rsnd_priv_read(p, r)            rsnd_read(p, NULL, RSND_REG_##r)
-#define rsnd_priv_write(p, r, d)        rsnd_write(p, NULL, RSND_REG_##r, d)
-#define rsnd_priv_bset(p, r, s, d)      rsnd_bset(p, NULL, RSND_REG_##r, s, d)
-
 u32 rsnd_read(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg);
 void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod,
                 enum rsnd_reg reg, u32 data);