Skip to content

Commit 96990cf

Browse files
vijendarmukundabroonie
authored andcommitted
ASoC: intel: rename soundwire machine driver soc ops
Rename Soundwire generic machine driver soc ops with tag "asoc". Link: thesofproject#5068 Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://patch.msgid.link/20240801091446.10457-4-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 408a454 commit 96990cf

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

sound/soc/intel/boards/sof_sdw.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,12 @@ static const struct snd_kcontrol_new rt700_controls[] = {
594594
};
595595

596596
/* these wrappers are only needed to avoid typecast compilation errors */
597-
int sdw_startup(struct snd_pcm_substream *substream)
597+
int asoc_sdw_startup(struct snd_pcm_substream *substream)
598598
{
599599
return sdw_startup_stream(substream);
600600
}
601601

602-
int sdw_prepare(struct snd_pcm_substream *substream)
602+
int asoc_sdw_prepare(struct snd_pcm_substream *substream)
603603
{
604604
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
605605
struct sdw_stream_runtime *sdw_stream;
@@ -617,7 +617,7 @@ int sdw_prepare(struct snd_pcm_substream *substream)
617617
return sdw_prepare_stream(sdw_stream);
618618
}
619619

620-
int sdw_trigger(struct snd_pcm_substream *substream, int cmd)
620+
int asoc_sdw_trigger(struct snd_pcm_substream *substream, int cmd)
621621
{
622622
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
623623
struct sdw_stream_runtime *sdw_stream;
@@ -656,8 +656,8 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd)
656656
return ret;
657657
}
658658

659-
int sdw_hw_params(struct snd_pcm_substream *substream,
660-
struct snd_pcm_hw_params *params)
659+
int asoc_sdw_hw_params(struct snd_pcm_substream *substream,
660+
struct snd_pcm_hw_params *params)
661661
{
662662
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
663663
struct snd_soc_dai_link_ch_map *ch_maps;
@@ -699,7 +699,7 @@ int sdw_hw_params(struct snd_pcm_substream *substream,
699699
return 0;
700700
}
701701

702-
int sdw_hw_free(struct snd_pcm_substream *substream)
702+
int asoc_sdw_hw_free(struct snd_pcm_substream *substream)
703703
{
704704
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
705705
struct sdw_stream_runtime *sdw_stream;
@@ -717,18 +717,18 @@ int sdw_hw_free(struct snd_pcm_substream *substream)
717717
return sdw_deprepare_stream(sdw_stream);
718718
}
719719

720-
void sdw_shutdown(struct snd_pcm_substream *substream)
720+
void asoc_sdw_shutdown(struct snd_pcm_substream *substream)
721721
{
722722
sdw_shutdown_stream(substream);
723723
}
724724

725725
static const struct snd_soc_ops sdw_ops = {
726-
.startup = sdw_startup,
727-
.prepare = sdw_prepare,
728-
.trigger = sdw_trigger,
729-
.hw_params = sdw_hw_params,
730-
.hw_free = sdw_hw_free,
731-
.shutdown = sdw_shutdown,
726+
.startup = asoc_sdw_startup,
727+
.prepare = asoc_sdw_prepare,
728+
.trigger = asoc_sdw_trigger,
729+
.hw_params = asoc_sdw_hw_params,
730+
.hw_free = asoc_sdw_hw_free,
731+
.shutdown = asoc_sdw_shutdown,
732732
};
733733

734734
static struct asoc_sdw_codec_info codec_info_list[] = {

sound/soc/intel/boards/sof_sdw_common.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ struct mc_private {
134134

135135
extern unsigned long sof_sdw_quirk;
136136

137-
int sdw_startup(struct snd_pcm_substream *substream);
138-
int sdw_prepare(struct snd_pcm_substream *substream);
139-
int sdw_trigger(struct snd_pcm_substream *substream, int cmd);
140-
int sdw_hw_params(struct snd_pcm_substream *substream,
141-
struct snd_pcm_hw_params *params);
142-
int sdw_hw_free(struct snd_pcm_substream *substream);
143-
void sdw_shutdown(struct snd_pcm_substream *substream);
137+
int asoc_sdw_startup(struct snd_pcm_substream *substream);
138+
int asoc_sdw_prepare(struct snd_pcm_substream *substream);
139+
int asoc_sdw_trigger(struct snd_pcm_substream *substream, int cmd);
140+
int asoc_sdw_hw_params(struct snd_pcm_substream *substream,
141+
struct snd_pcm_hw_params *params);
142+
int asoc_sdw_hw_free(struct snd_pcm_substream *substream);
143+
void asoc_sdw_shutdown(struct snd_pcm_substream *substream);
144144

145145
/* generic HDMI support */
146146
int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);

sound/soc/intel/boards/sof_sdw_maxim.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
8080
int ret;
8181

8282
/* according to soc_pcm_prepare dai link prepare is called first */
83-
ret = sdw_prepare(substream);
83+
ret = asoc_sdw_prepare(substream);
8484
if (ret < 0)
8585
return ret;
8686

@@ -92,20 +92,20 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
9292
int ret;
9393

9494
/* according to soc_pcm_hw_free dai link free is called first */
95-
ret = sdw_hw_free(substream);
95+
ret = asoc_sdw_hw_free(substream);
9696
if (ret < 0)
9797
return ret;
9898

9999
return mx8373_enable_spk_pin(substream, false);
100100
}
101101

102102
static const struct snd_soc_ops max_98373_sdw_ops = {
103-
.startup = sdw_startup,
103+
.startup = asoc_sdw_startup,
104104
.prepare = mx8373_sdw_prepare,
105-
.trigger = sdw_trigger,
106-
.hw_params = sdw_hw_params,
105+
.trigger = asoc_sdw_trigger,
106+
.hw_params = asoc_sdw_hw_params,
107107
.hw_free = mx8373_sdw_hw_free,
108-
.shutdown = sdw_shutdown,
108+
.shutdown = asoc_sdw_shutdown,
109109
};
110110

111111
static int mx8373_sdw_late_probe(struct snd_soc_card *card)

0 commit comments

Comments
 (0)