Skip to content

Commit c5e8ef7

Browse files
morimotoDinh Nguyen
authored andcommitted
ASoC: rsnd: tidyup SSI parent related function/macro names
Current rsnd driver is using SSI parent related function/macro as "clock" related. but it is not only clock related. tidyup function/macro naming. Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]> (cherry picked from commit 8c5c79a) Signed-off-by: Simon Horman <[email protected]>
1 parent c7d5c5f commit c5e8ef7

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

sound/soc/sh/rcar/ssi.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct rsnd_ssi {
8080
#define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod)
8181
#define rsnd_dma_to_ssi(dma) rsnd_mod_to_ssi(rsnd_dma_to_mod(dma))
8282
#define rsnd_ssi_pio_available(ssi) ((ssi)->info->irq > 0)
83-
#define rsnd_ssi_clk_from_parent(ssi) ((ssi)->parent)
83+
#define rsnd_ssi_parent(ssi) ((ssi)->parent)
8484
#define rsnd_ssi_mode_flags(p) ((p)->info->flags)
8585
#define rsnd_ssi_dai_id(ssi) ((ssi)->info->dai_id)
8686
#define rsnd_ssi_of_node(priv) \
@@ -189,8 +189,10 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
189189
rsnd_mod_hw_start(&ssi->mod);
190190

191191
if (rsnd_rdai_is_clk_master(rdai)) {
192-
if (rsnd_ssi_clk_from_parent(ssi))
193-
rsnd_ssi_hw_start(ssi->parent, io);
192+
struct rsnd_ssi *ssi_parent = rsnd_ssi_parent(ssi);
193+
194+
if (ssi_parent)
195+
rsnd_ssi_hw_start(ssi_parent, io);
194196
else
195197
rsnd_ssi_master_clk_start(ssi, io);
196198
}
@@ -253,8 +255,10 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi)
253255
rsnd_ssi_status_check(&ssi->mod, IIRQ);
254256

255257
if (rsnd_rdai_is_clk_master(rdai)) {
256-
if (rsnd_ssi_clk_from_parent(ssi))
257-
rsnd_ssi_hw_stop(ssi->parent);
258+
struct rsnd_ssi *ssi_parent = rsnd_ssi_parent(ssi);
259+
260+
if (ssi_parent)
261+
rsnd_ssi_hw_stop(ssi_parent);
258262
else
259263
rsnd_ssi_master_clk_stop(ssi);
260264
}
@@ -598,7 +602,7 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
598602
return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
599603
}
600604

601-
static void rsnd_ssi_parent_clk_setup(struct rsnd_priv *priv, struct rsnd_ssi *ssi)
605+
static void rsnd_ssi_parent_setup(struct rsnd_priv *priv, struct rsnd_ssi *ssi)
602606
{
603607
if (!rsnd_ssi_is_pin_sharing(&ssi->mod))
604608
return;
@@ -732,7 +736,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
732736
if (ret)
733737
return ret;
734738

735-
rsnd_ssi_parent_clk_setup(priv, ssi);
739+
rsnd_ssi_parent_setup(priv, ssi);
736740
}
737741

738742
return 0;

0 commit comments

Comments
 (0)