Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30cc4faf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rsnd: tidyup debug message format and timing 



Current Renesas R-Car sound driver debug message
is using random format
(ex "ssi0: xxx" / "SSI0 xxx" / "ssi[0]: xxx")
and confusable timing
("xxx probe failed" and "xxx probed" are shown in same time)
This patch fixes these

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 01834297

sound/soc/sh/rcar/dvc.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod, 
	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct device *dev = rsnd_priv_to_dev(priv);



	dev_dbg(dev, "%s (Gen2) is probed\n", rsnd_mod_name(mod));

	dev_dbg(dev, "%s[%d] (Gen2) is probed\n",

		rsnd_mod_name(mod), rsnd_mod_id(mod));



	return 0;

}

sound/soc/sh/rcar/gen.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ u32 rsnd_read(struct rsnd_priv *priv, 
	if (!rsnd_is_accessible_reg(priv, gen, reg))

		return 0;



	dev_dbg(dev, "r %s(%d) - %4d : %08x\n",

	dev_dbg(dev, "r %s[%d] - %4d : %08x\n",

		rsnd_mod_name(mod), rsnd_mod_id(mod), reg, val);



	regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
@@ -96,7 +96,7 @@ void rsnd_write(struct rsnd_priv *priv, 
	if (!rsnd_is_accessible_reg(priv, gen, reg))

		return;



	dev_dbg(dev, "w %s(%d) - %4d : %08x\n",

	dev_dbg(dev, "w %s[%d] - %4d : %08x\n",

		rsnd_mod_name(mod), rsnd_mod_id(mod), reg, data);



	regmap_fields_write(gen->regs[reg], rsnd_mod_id(mod), data);
@@ -111,7 +111,7 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, 
	if (!rsnd_is_accessible_reg(priv, gen, reg))

		return;



	dev_dbg(dev, "b %s(%d) - %4d : %08x/%08x\n",

	dev_dbg(dev, "b %s[%d] - %4d : %08x/%08x\n",

		rsnd_mod_name(mod), rsnd_mod_id(mod), reg, data, mask);



	regmap_fields_update_bits(gen->regs[reg], rsnd_mod_id(mod),

sound/soc/sh/rcar/src.c

+7 −4
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ static int rsnd_src_probe_gen1(struct rsnd_mod *mod, 
	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);

	struct device *dev = rsnd_priv_to_dev(priv);



	dev_dbg(dev, "%s (Gen1) is probed\n", rsnd_mod_name(mod));

	dev_dbg(dev, "%s[%d] (Gen1) is probed\n",

		rsnd_mod_name(mod), rsnd_mod_id(mod));



	return 0;

}
@@ -578,9 +579,11 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod, 
			    rsnd_info_is_playback(priv, src),

			    src->info->dma_id);

	if (ret < 0)

		dev_err(dev, "SRC DMA failed\n");



	dev_dbg(dev, "%s (Gen2) is probed\n", rsnd_mod_name(mod));

		dev_err(dev, "%s[%d] (Gen2) failed\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));

	else

		dev_dbg(dev, "%s[%d] (Gen2) is probed\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));



	return ret;

}

sound/soc/sh/rcar/ssi.c

+16 −9
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, 
				ssi->cr_clk	= FORCE | SWL_32 |

						  SCKD | SWSD | CKDV(j);



				dev_dbg(dev, "ssi%d outputs %u Hz\n",

				dev_dbg(dev, "%s[%d] outputs %u Hz\n",

					rsnd_mod_name(&ssi->mod),

					rsnd_mod_id(&ssi->mod), rate);



				return 0;
@@ -206,7 +207,8 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi, 


	ssi->usrcnt++;



	dev_dbg(dev, "ssi%d hw started\n", rsnd_mod_id(&ssi->mod));

	dev_dbg(dev, "%s[%d] hw started\n",

		rsnd_mod_name(&ssi->mod), rsnd_mod_id(&ssi->mod));

}



static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
@@ -249,7 +251,8 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi, 
		clk_disable_unprepare(ssi->clk);

	}



	dev_dbg(dev, "ssi%d hw stopped\n", rsnd_mod_id(&ssi->mod));

	dev_dbg(dev, "%s[%d] hw stopped\n",

		rsnd_mod_name(&ssi->mod), rsnd_mod_id(&ssi->mod));

}



/*
@@ -385,9 +388,11 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod, 
			       IRQF_SHARED,

			       dev_name(dev), ssi);

	if (ret)

		dev_err(dev, "SSI request interrupt failed\n");



	dev_dbg(dev, "%s (PIO) is probed\n", rsnd_mod_name(mod));

		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;

}
@@ -448,9 +453,11 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, 
		dma_id);



	if (ret < 0)

		dev_err(dev, "SSI DMA failed\n");



	dev_dbg(dev, "%s (DMA) is probed\n", rsnd_mod_name(mod));

		dev_err(dev, "%s[%d] (DMA) is failed\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));

	else

		dev_dbg(dev, "%s[%d] (DMA) is probed\n",

			rsnd_mod_name(mod), rsnd_mod_id(mod));



	return ret;

}

sound/soc/sh/rcar/core.c

+1 −1

File changed.

Contains only whitespace changes.