Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 22:05:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: SOF: Rename sof_arch_ops to dsp_arch_ops

Browse Source 
From the name sof_arch_ops one can not decipher that these ops are DSP
architecture ops.
Rename it to dsp_arch_ops and change also the macro to retrieve the DSP
architecture specific ops as well.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210916130308.7969-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2021-09-16 16:03:08 +03:00 committed by Mark Brown
parent f6b0c731a0
commit 0ed66cb7b6
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sof/imx/imx8.c
View File

@ -439,7 +439,7 @@ struct snd_sof_dsp_ops sof_imx8_ops = {
.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,
/* Firmware ops */
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
/* DAI drivers */
.drv = imx8_dai,
@ -486,7 +486,7 @@ struct snd_sof_dsp_ops sof_imx8x_ops = {
.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,
/* Firmware ops */
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
/* DAI drivers */
.drv = imx8_dai,

2
sound/soc/sof/imx/imx8m.c
View File

@ -302,7 +302,7 @@ struct snd_sof_dsp_ops sof_imx8m_ops = {
.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,
/* Firmware ops */
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
/* DAI drivers */
.drv = imx8m_dai,

2
sound/soc/sof/intel/apl.c
View File

@ -126,7 +126,7 @@ const struct snd_sof_dsp_ops sof_apl_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
EXPORT_SYMBOL_NS(sof_apl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

2
sound/soc/sof/intel/bdw.c
View File

@ -658,7 +658,7 @@ static const struct snd_sof_dsp_ops sof_bdw_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
static const struct sof_intel_dsp_desc bdw_chip_info = {

4
sound/soc/sof/intel/byt.c
View File

@ -276,7 +276,7 @@ static const struct snd_sof_dsp_ops sof_byt_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
static const struct sof_intel_dsp_desc byt_chip_info = {
@ -355,7 +355,7 @@ static const struct snd_sof_dsp_ops sof_cht_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
static const struct sof_intel_dsp_desc cht_chip_info = {

2
sound/soc/sof/intel/cnl.c
View File

@ -331,7 +331,7 @@ const struct snd_sof_dsp_ops sof_cnl_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

2
sound/soc/sof/intel/icl.c
View File

@ -126,7 +126,7 @@ const struct snd_sof_dsp_ops sof_icl_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
EXPORT_SYMBOL_NS(sof_icl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

2
sound/soc/sof/intel/pci-tng.c
View File

@ -188,7 +188,7 @@ const struct snd_sof_dsp_ops sof_tng_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
const struct sof_intel_dsp_desc tng_chip_info = {

2
sound/soc/sof/intel/tgl.c
View File

@ -121,7 +121,7 @@ const struct snd_sof_dsp_ops sof_tgl_ops = {
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
.arch_ops = &sof_xtensa_arch_ops,
.dsp_arch_ops = &sof_xtensa_arch_ops,
};
EXPORT_SYMBOL_NS(sof_tgl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

14
sound/soc/sof/sof-priv.h
View File

@ -282,17 +282,17 @@ struct snd_sof_dsp_ops {
/* ALSA HW info flags, will be stored in snd_pcm_runtime.hw.info */
u32 hw_info;
const struct sof_arch_ops *arch_ops;
const struct dsp_arch_ops *dsp_arch_ops;
};
/* DSP architecture specific callbacks for oops and stack dumps */
struct sof_arch_ops {
struct dsp_arch_ops {
void (*dsp_oops)(struct snd_sof_dev *sdev, void *oops);
void (*dsp_stack)(struct snd_sof_dev *sdev, void *oops,
u32 *stack, u32 stack_words);
};
#define sof_arch_ops(sdev) ((sdev)->pdata->desc->ops->arch_ops)
#define sof_dsp_arch_ops(sdev) ((sdev)->pdata->desc->ops->dsp_arch_ops)
/* DSP device HW descriptor mapping between bus ID and ops */
struct sof_ops_table {
@ -544,16 +544,16 @@ int snd_sof_debugfs_add_region_item_iomem(struct snd_sof_dev *sdev,
static inline void sof_stack(struct snd_sof_dev *sdev, void *oops, u32 *stack,
u32 stack_words)
{
sof_arch_ops(sdev)->dsp_stack(sdev, oops, stack, stack_words);
sof_dsp_arch_ops(sdev)->dsp_stack(sdev, oops, stack, stack_words);
}
static inline void sof_oops(struct snd_sof_dev *sdev, void *oops)
{
if (sof_arch_ops(sdev)->dsp_oops)
sof_arch_ops(sdev)->dsp_oops(sdev, oops);
if (sof_dsp_arch_ops(sdev)->dsp_oops)
sof_dsp_arch_ops(sdev)->dsp_oops(sdev, oops);
}
extern const struct sof_arch_ops sof_xtensa_arch_ops;
extern const struct dsp_arch_ops sof_xtensa_arch_ops;
/*
* Utilities

2
sound/soc/sof/xtensa/core.c
View File

@ -128,7 +128,7 @@ static void xtensa_stack(struct snd_sof_dev *sdev, void *oops, u32 *stack,
}
}
const struct sof_arch_ops sof_xtensa_arch_ops = {
const struct dsp_arch_ops sof_xtensa_arch_ops = {
.dsp_oops = xtensa_dsp_oops,
.dsp_stack = xtensa_stack,
};