ASoC: SOF: Rename sof_arch_ops to dsp_arch_ops

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>

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 199ddf7..b75608e 100644 (file)
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -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,

diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c
index 0335175..969117e 100644 (file)
--- a/sound/soc/sof/imx/imx8m.c
+++ b/sound/soc/sof/imx/imx8m.c
@@ -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,

diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index 0da6f35..e6a1f65 100644 (file)
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -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);
 

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index a8063e9..d092754 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -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 = {

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index d4e86f8..8f60c72 100644 (file)
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -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 = {

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index eeb95cb..430a268 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -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);
 

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index f5e370c..38a40c0 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -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);
 

diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index ccfb97c..3d6d013 100644 (file)
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -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 = {

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index e91ea80..664a11a 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -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);
 

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index aa9db44..9b1bdba 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -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

diff --git a/sound/soc/sof/xtensa/core.c b/sound/soc/sof/xtensa/core.c
index bbb9a22..85f1eb1 100644 (file)
--- a/sound/soc/sof/xtensa/core.c
+++ b/sound/soc/sof/xtensa/core.c
@@ -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,
 };