6 files changed, 2 insertions, 70 deletions

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 7af374bd0849..fefc881dbac2 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -434,7 +434,5 @@ int rsnd_adg_probe(struct platform_device *pdev,
 
         priv->adg = adg;
 
-        dev_dbg(dev, "adg probed\n");
-
         return 0;
 }
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index cd7b79a01ce2..ac3756f6af60 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -144,8 +144,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
                 return -EIO;
         }
 
-        dev_dbg(dev, "Audio DMAC init\n");
-
         if (dev->of_node) {
                 dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to);
         } else {
@@ -329,8 +327,6 @@ static int rsnd_dmapp_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
         struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
         struct device *dev = rsnd_priv_to_dev(priv);
 
-        dev_dbg(dev, "Audio DMAC peri peri init\n");
-
         dmapp->dmapp_id = dmac->dmapp_num;
         dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE;
 
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index aab45267e508..e5fcb062ad77 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -119,17 +119,6 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
         rsnd_mod_write(mod, DVC_DVUER, 1);
 }
 
-static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_priv *priv)
-{
-        struct device *dev = rsnd_priv_to_dev(priv);
-
-        dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return 0;
-}
-
 static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,
                                 struct rsnd_priv *priv)
 {
@@ -283,7 +272,6 @@ static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_mod *mod)
 static struct rsnd_mod_ops rsnd_dvc_ops = {
         .name           = DVC_NAME,
         .dma_req        = rsnd_dvc_dma_req,
-        .probe          = rsnd_dvc_probe_gen2,
         .remove         = rsnd_dvc_remove_gen2,
         .init           = rsnd_dvc_init,
         .quit           = rsnd_dvc_quit,
@@ -382,8 +370,6 @@ int rsnd_dvc_probe(struct platform_device *pdev,
                               clk, RSND_MOD_DVC, i);
                 if (ret)
                         return ret;
-
-                dev_dbg(dev, "CMD%d probed\n", i);
         }
 
         return 0;
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index a17a504d93b5..8c7dc51b1c4f 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -194,7 +194,6 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
 static int rsnd_gen2_probe(struct platform_device *pdev,
                            struct rsnd_priv *priv)
 {
-        struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_regmap_field_conf conf_ssiu[] = {
                 RSND_GEN_S_REG(SSI_MODE0,       0x800),
                 RSND_GEN_S_REG(SSI_MODE1,       0x804),
@@ -278,8 +277,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
             ret_ssi  < 0)
                 return ret_ssiu | ret_scu | ret_adg | ret_ssi;
 
-        dev_dbg(dev, "Gen2 is probed\n");
-
         return 0;
 }
 
@@ -290,7 +287,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
 static int rsnd_gen1_probe(struct platform_device *pdev,
                            struct rsnd_priv *priv)
 {
-        struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_regmap_field_conf conf_sru[] = {
                 RSND_GEN_S_REG(SRC_ROUTE_SEL,   0x00),
                 RSND_GEN_S_REG(SRC_TMG_SEL0,    0x08),
@@ -348,8 +344,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
             ret_ssi  < 0)
                 return ret_sru | ret_adg | ret_ssi;
 
-        dev_dbg(dev, "Gen1 is probed\n");
-
         return 0;
 }
 
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 6099a8ee0007..83611fa450bf 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -460,17 +460,6 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_probe_gen1(struct rsnd_mod *mod,
-                               struct rsnd_priv *priv)
-{
-        struct device *dev = rsnd_priv_to_dev(priv);
-
-        dev_dbg(dev, "%s[%d] (Gen1) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return 0;
-}
-
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
                               struct rsnd_priv *priv)
 {
@@ -518,7 +507,6 @@ static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
 static struct rsnd_mod_ops rsnd_src_gen1_ops = {
         .name   = SRC_NAME,
         .dma_req = rsnd_src_dma_req,
-        .probe  = rsnd_src_probe_gen1,
         .init   = rsnd_src_init_gen1,
         .quit   = rsnd_src_quit,
         .start  = rsnd_src_start_gen1,
@@ -725,23 +713,12 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
                                        IRQF_SHARED,
                                        dev_name(dev), mod);
                 if (ret)
-                        goto rsnd_src_probe_gen2_fail;
+                        return ret;
         }
 
         ret = rsnd_dma_init(priv,
                             rsnd_mod_to_dma(mod),
                             src->info->dma_id);
-        if (ret)
-                goto rsnd_src_probe_gen2_fail;
-
-        dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return ret;
-
-rsnd_src_probe_gen2_fail:
-        dev_err(dev, "%s[%d] (Gen2) failed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
@@ -910,8 +887,6 @@ int rsnd_src_probe(struct platform_device *pdev,
                 ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);
                 if (ret)
                         return ret;
-
-                dev_dbg(dev, "SRC%d probed\n", i);
         }
 
         return 0;
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 79dc7a3c78e6..7bb9c087f3dc 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -445,12 +445,6 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
                                rsnd_ssi_interrupt,
                                IRQF_SHARED,
                                dev_name(dev), ssi);
-        if (ret)
-                dev_err(dev, "%s[%d] (PIO) request interrupt failed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
-        else
-                dev_dbg(dev, "%s[%d] (PIO) is probed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
@@ -477,22 +471,11 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
                                IRQF_SHARED,
                                dev_name(dev), ssi);
         if (ret)
-                goto rsnd_ssi_dma_probe_fail;
+                return ret;
 
         ret = rsnd_dma_init(
                 priv, rsnd_mod_to_dma(mod),
                 dma_id);
-        if (ret)
-                goto rsnd_ssi_dma_probe_fail;
-
-        dev_dbg(dev, "%s[%d] (DMA) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return ret;
-
-rsnd_ssi_dma_probe_fail:
-        dev_err(dev, "%s[%d] (DMA) is failed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }