diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-03-26 00:02:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-27 19:00:47 -0400 |
commit | b543b52a44c4e45283cd17721af1299049405136 (patch) | |
tree | 2583f85162aa55d27db607a40f9bf3e65d8d2b78 /sound | |
parent | f8d04e7d91f86c61dbb096d81b99cd692b87fa19 (diff) |
ASoC: rsnd: remove useless debug message
This patch removes useless debug message. especially some kind of
"probed" message will be printed from core.c if it has #define DEBUG
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/rcar/adg.c | 2 | ||||
-rw-r--r-- | sound/soc/sh/rcar/dma.c | 4 | ||||
-rw-r--r-- | sound/soc/sh/rcar/dvc.c | 14 | ||||
-rw-r--r-- | sound/soc/sh/rcar/gen.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/rcar/src.c | 27 | ||||
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 19 |
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, | |||
434 | 434 | ||
435 | priv->adg = adg; | 435 | priv->adg = adg; |
436 | 436 | ||
437 | dev_dbg(dev, "adg probed\n"); | ||
438 | |||
439 | return 0; | 437 | return 0; |
440 | } | 438 | } |
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, | |||
144 | return -EIO; | 144 | return -EIO; |
145 | } | 145 | } |
146 | 146 | ||
147 | dev_dbg(dev, "Audio DMAC init\n"); | ||
148 | |||
149 | if (dev->of_node) { | 147 | if (dev->of_node) { |
150 | dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to); | 148 | dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to); |
151 | } else { | 149 | } else { |
@@ -329,8 +327,6 @@ static int rsnd_dmapp_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, | |||
329 | struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); | 327 | struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); |
330 | struct device *dev = rsnd_priv_to_dev(priv); | 328 | struct device *dev = rsnd_priv_to_dev(priv); |
331 | 329 | ||
332 | dev_dbg(dev, "Audio DMAC peri peri init\n"); | ||
333 | |||
334 | dmapp->dmapp_id = dmac->dmapp_num; | 330 | dmapp->dmapp_id = dmac->dmapp_num; |
335 | dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE; | 331 | dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE; |
336 | 332 | ||
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) | |||
119 | rsnd_mod_write(mod, DVC_DVUER, 1); | 119 | rsnd_mod_write(mod, DVC_DVUER, 1); |
120 | } | 120 | } |
121 | 121 | ||
122 | static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod, | ||
123 | struct rsnd_priv *priv) | ||
124 | { | ||
125 | struct device *dev = rsnd_priv_to_dev(priv); | ||
126 | |||
127 | dev_dbg(dev, "%s[%d] (Gen2) is probed\n", | ||
128 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
129 | |||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod, | 122 | static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod, |
134 | struct rsnd_priv *priv) | 123 | struct rsnd_priv *priv) |
135 | { | 124 | { |
@@ -283,7 +272,6 @@ static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_mod *mod) | |||
283 | static struct rsnd_mod_ops rsnd_dvc_ops = { | 272 | static struct rsnd_mod_ops rsnd_dvc_ops = { |
284 | .name = DVC_NAME, | 273 | .name = DVC_NAME, |
285 | .dma_req = rsnd_dvc_dma_req, | 274 | .dma_req = rsnd_dvc_dma_req, |
286 | .probe = rsnd_dvc_probe_gen2, | ||
287 | .remove = rsnd_dvc_remove_gen2, | 275 | .remove = rsnd_dvc_remove_gen2, |
288 | .init = rsnd_dvc_init, | 276 | .init = rsnd_dvc_init, |
289 | .quit = rsnd_dvc_quit, | 277 | .quit = rsnd_dvc_quit, |
@@ -382,8 +370,6 @@ int rsnd_dvc_probe(struct platform_device *pdev, | |||
382 | clk, RSND_MOD_DVC, i); | 370 | clk, RSND_MOD_DVC, i); |
383 | if (ret) | 371 | if (ret) |
384 | return ret; | 372 | return ret; |
385 | |||
386 | dev_dbg(dev, "CMD%d probed\n", i); | ||
387 | } | 373 | } |
388 | 374 | ||
389 | return 0; | 375 | 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, | |||
194 | static int rsnd_gen2_probe(struct platform_device *pdev, | 194 | static int rsnd_gen2_probe(struct platform_device *pdev, |
195 | struct rsnd_priv *priv) | 195 | struct rsnd_priv *priv) |
196 | { | 196 | { |
197 | struct device *dev = rsnd_priv_to_dev(priv); | ||
198 | struct rsnd_regmap_field_conf conf_ssiu[] = { | 197 | struct rsnd_regmap_field_conf conf_ssiu[] = { |
199 | RSND_GEN_S_REG(SSI_MODE0, 0x800), | 198 | RSND_GEN_S_REG(SSI_MODE0, 0x800), |
200 | RSND_GEN_S_REG(SSI_MODE1, 0x804), | 199 | RSND_GEN_S_REG(SSI_MODE1, 0x804), |
@@ -278,8 +277,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev, | |||
278 | ret_ssi < 0) | 277 | ret_ssi < 0) |
279 | return ret_ssiu | ret_scu | ret_adg | ret_ssi; | 278 | return ret_ssiu | ret_scu | ret_adg | ret_ssi; |
280 | 279 | ||
281 | dev_dbg(dev, "Gen2 is probed\n"); | ||
282 | |||
283 | return 0; | 280 | return 0; |
284 | } | 281 | } |
285 | 282 | ||
@@ -290,7 +287,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev, | |||
290 | static int rsnd_gen1_probe(struct platform_device *pdev, | 287 | static int rsnd_gen1_probe(struct platform_device *pdev, |
291 | struct rsnd_priv *priv) | 288 | struct rsnd_priv *priv) |
292 | { | 289 | { |
293 | struct device *dev = rsnd_priv_to_dev(priv); | ||
294 | struct rsnd_regmap_field_conf conf_sru[] = { | 290 | struct rsnd_regmap_field_conf conf_sru[] = { |
295 | RSND_GEN_S_REG(SRC_ROUTE_SEL, 0x00), | 291 | RSND_GEN_S_REG(SRC_ROUTE_SEL, 0x00), |
296 | RSND_GEN_S_REG(SRC_TMG_SEL0, 0x08), | 292 | RSND_GEN_S_REG(SRC_TMG_SEL0, 0x08), |
@@ -348,8 +344,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev, | |||
348 | ret_ssi < 0) | 344 | ret_ssi < 0) |
349 | return ret_sru | ret_adg | ret_ssi; | 345 | return ret_sru | ret_adg | ret_ssi; |
350 | 346 | ||
351 | dev_dbg(dev, "Gen1 is probed\n"); | ||
352 | |||
353 | return 0; | 347 | return 0; |
354 | } | 348 | } |
355 | 349 | ||
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) | |||
460 | return 0; | 460 | return 0; |
461 | } | 461 | } |
462 | 462 | ||
463 | static int rsnd_src_probe_gen1(struct rsnd_mod *mod, | ||
464 | struct rsnd_priv *priv) | ||
465 | { | ||
466 | struct device *dev = rsnd_priv_to_dev(priv); | ||
467 | |||
468 | dev_dbg(dev, "%s[%d] (Gen1) is probed\n", | ||
469 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
470 | |||
471 | return 0; | ||
472 | } | ||
473 | |||
474 | static int rsnd_src_init_gen1(struct rsnd_mod *mod, | 463 | static int rsnd_src_init_gen1(struct rsnd_mod *mod, |
475 | struct rsnd_priv *priv) | 464 | struct rsnd_priv *priv) |
476 | { | 465 | { |
@@ -518,7 +507,6 @@ static int rsnd_src_stop_gen1(struct rsnd_mod *mod, | |||
518 | static struct rsnd_mod_ops rsnd_src_gen1_ops = { | 507 | static struct rsnd_mod_ops rsnd_src_gen1_ops = { |
519 | .name = SRC_NAME, | 508 | .name = SRC_NAME, |
520 | .dma_req = rsnd_src_dma_req, | 509 | .dma_req = rsnd_src_dma_req, |
521 | .probe = rsnd_src_probe_gen1, | ||
522 | .init = rsnd_src_init_gen1, | 510 | .init = rsnd_src_init_gen1, |
523 | .quit = rsnd_src_quit, | 511 | .quit = rsnd_src_quit, |
524 | .start = rsnd_src_start_gen1, | 512 | .start = rsnd_src_start_gen1, |
@@ -725,23 +713,12 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod, | |||
725 | IRQF_SHARED, | 713 | IRQF_SHARED, |
726 | dev_name(dev), mod); | 714 | dev_name(dev), mod); |
727 | if (ret) | 715 | if (ret) |
728 | goto rsnd_src_probe_gen2_fail; | 716 | return ret; |
729 | } | 717 | } |
730 | 718 | ||
731 | ret = rsnd_dma_init(priv, | 719 | ret = rsnd_dma_init(priv, |
732 | rsnd_mod_to_dma(mod), | 720 | rsnd_mod_to_dma(mod), |
733 | src->info->dma_id); | 721 | src->info->dma_id); |
734 | if (ret) | ||
735 | goto rsnd_src_probe_gen2_fail; | ||
736 | |||
737 | dev_dbg(dev, "%s[%d] (Gen2) is probed\n", | ||
738 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
739 | |||
740 | return ret; | ||
741 | |||
742 | rsnd_src_probe_gen2_fail: | ||
743 | dev_err(dev, "%s[%d] (Gen2) failed\n", | ||
744 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
745 | 722 | ||
746 | return ret; | 723 | return ret; |
747 | } | 724 | } |
@@ -910,8 +887,6 @@ int rsnd_src_probe(struct platform_device *pdev, | |||
910 | ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i); | 887 | ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i); |
911 | if (ret) | 888 | if (ret) |
912 | return ret; | 889 | return ret; |
913 | |||
914 | dev_dbg(dev, "SRC%d probed\n", i); | ||
915 | } | 890 | } |
916 | 891 | ||
917 | return 0; | 892 | 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, | |||
445 | rsnd_ssi_interrupt, | 445 | rsnd_ssi_interrupt, |
446 | IRQF_SHARED, | 446 | IRQF_SHARED, |
447 | dev_name(dev), ssi); | 447 | dev_name(dev), ssi); |
448 | if (ret) | ||
449 | dev_err(dev, "%s[%d] (PIO) request interrupt failed\n", | ||
450 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
451 | else | ||
452 | dev_dbg(dev, "%s[%d] (PIO) is probed\n", | ||
453 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
454 | 448 | ||
455 | return ret; | 449 | return ret; |
456 | } | 450 | } |
@@ -477,22 +471,11 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, | |||
477 | IRQF_SHARED, | 471 | IRQF_SHARED, |
478 | dev_name(dev), ssi); | 472 | dev_name(dev), ssi); |
479 | if (ret) | 473 | if (ret) |
480 | goto rsnd_ssi_dma_probe_fail; | 474 | return ret; |
481 | 475 | ||
482 | ret = rsnd_dma_init( | 476 | ret = rsnd_dma_init( |
483 | priv, rsnd_mod_to_dma(mod), | 477 | priv, rsnd_mod_to_dma(mod), |
484 | dma_id); | 478 | dma_id); |
485 | if (ret) | ||
486 | goto rsnd_ssi_dma_probe_fail; | ||
487 | |||
488 | dev_dbg(dev, "%s[%d] (DMA) is probed\n", | ||
489 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
490 | |||
491 | return ret; | ||
492 | |||
493 | rsnd_ssi_dma_probe_fail: | ||
494 | dev_err(dev, "%s[%d] (DMA) is failed\n", | ||
495 | rsnd_mod_name(mod), rsnd_mod_id(mod)); | ||
496 | 479 | ||
497 | return ret; | 480 | return ret; |
498 | } | 481 | } |