1 files changed, 17 insertions, 72 deletions

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 4b7e20603dd7..36654bd4e428 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -171,7 +171,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
         u32 cr;
 
         if (0 == ssi->usrcnt) {
-                clk_enable(ssi->clk);
+                clk_prepare_enable(ssi->clk);
 
                 if (rsnd_dai_is_clk_master(rdai)) {
                         if (rsnd_ssi_clk_from_parent(ssi))
@@ -230,7 +230,7 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
                                 rsnd_ssi_master_clk_stop(ssi);
                 }
 
-                clk_disable(ssi->clk);
+                clk_disable_unprepare(ssi->clk);
         }
 
         dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));
@@ -240,10 +240,10 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
  *      SSI mod common functions
  */
 static int rsnd_ssi_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 cr;
 
@@ -287,14 +287,13 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
         ssi->cr_own     = cr;
         ssi->err        = -1; /* ignore 1st error */
 
-        rsnd_src_ssi_mode_init(mod, rdai, io);
+        rsnd_src_ssi_mode_init(mod, rdai);
 
         return 0;
 }
 
 static int rsnd_ssi_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
@@ -359,8 +358,7 @@ static irqreturn_t rsnd_ssi_pio_interrupt(int irq, void *data)
 }
 
 static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
@@ -379,15 +377,15 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
         /* enable PIO IRQ */
         ssi->cr_etc = UIEN | OIEN | DIEN;
 
-        rsnd_src_enable_ssi_irq(mod, rdai, io);
+        rsnd_src_enable_ssi_irq(mod, rdai);
 
         rsnd_ssi_hw_start(ssi, rdai, io);
 
@@ -395,8 +393,7 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_pio_stop(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai,
-                             struct rsnd_dai_stream *io)
+                             struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
 
@@ -417,25 +414,17 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
 };
 
 static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai,
-                          struct rsnd_dai_stream *io)
+                          struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct device *dev = rsnd_priv_to_dev(priv);
         int dma_id = ssi->info->dma_id;
-        int is_play;
         int ret;
 
-        if (info->dai_info)
-                is_play = rsnd_info_is_playback(priv, ssi);
-        else
-                is_play = rsnd_ssi_is_play(&ssi->mod);
-
         ret = rsnd_dma_init(
                 priv, rsnd_mod_to_dma(mod),
-                is_play,
+                rsnd_info_is_playback(priv, ssi),
                 dma_id);
 
         if (ret < 0)
@@ -445,8 +434,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
 
@@ -454,11 +442,11 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dma *dma = rsnd_mod_to_dma(&ssi->mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
         /* enable DMA transfer */
         ssi->cr_etc = DMEN;
@@ -475,8 +463,7 @@ static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai,
-                             struct rsnd_dai_stream *io)
+                             struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dma *dma = rsnd_mod_to_dma(&ssi->mod);
@@ -512,41 +499,6 @@ static struct rsnd_mod_ops rsnd_ssi_non_ops = {
 /*
  *              ssi mod function
  */
-struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
-                                          int dai_id, int is_play)
-{
-        struct rsnd_dai_platform_info *dai_info = NULL;
-        struct rsnd_dai_path_info *path_info = NULL;
-        struct rsnd_ssi_platform_info *target_info = NULL;
-        struct rsnd_ssi *ssi;
-        int i, has_play;
-
-        if (priv->rdai)
-                dai_info = priv->rdai[dai_id].info;
-        if (dai_info)
-                path_info = (is_play) ? &dai_info->playback : &dai_info->capture;
-        if (path_info)
-                target_info = path_info->ssi;
-
-        is_play = !!is_play;
-
-        for_each_rsnd_ssi(ssi, priv, i) {
-                if (target_info == ssi->info)
-                        return &ssi->mod;
-
-                /* for compatible */
-                if (rsnd_ssi_dai_id(ssi) != dai_id)
-                        continue;
-
-                has_play = rsnd_ssi_is_play(&ssi->mod);
-
-                if (is_play == has_play)
-                        return &ssi->mod;
-        }
-
-        return NULL;
-}
-
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id)
 {
         if (WARN_ON(id < 0 || id >= rsnd_ssi_nr(priv)))
@@ -562,13 +514,6 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
         return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
 }
 
-int rsnd_ssi_is_play(struct rsnd_mod *mod)
-{
-        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-
-        return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_PLAY);
-}
-
 static void rsnd_ssi_parent_clk_setup(struct rsnd_priv *priv, struct rsnd_ssi *ssi)
 {
         if (!rsnd_ssi_is_pin_sharing(&ssi->mod))