OSDN Git Service

ASoC: SOF: sof-probes: Correct the function names used for snd_soc_cdai_ops
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Thu, 16 Sep 2021 10:32:11 +0000 (13:32 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 16 Sep 2021 13:04:15 +0000 (14:04 +0100)
The snd_soc_cdai_ops have startup and shutdown callbacks defined unlike
the component callbacks where open and free is used.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210916103211.1573-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/sof-probes.c

index e394fc5..5586af9 100644 (file)
@@ -230,8 +230,8 @@ int sof_ipc_probe_points_remove(struct snd_sof_dev *sdev,
 }
 EXPORT_SYMBOL(sof_ipc_probe_points_remove);
 
-static int sof_probe_compr_open(struct snd_compr_stream *cstream,
-                               struct snd_soc_dai *dai)
+static int sof_probe_compr_startup(struct snd_compr_stream *cstream,
+                                  struct snd_soc_dai *dai)
 {
        struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component);
        int ret;
@@ -246,8 +246,8 @@ static int sof_probe_compr_open(struct snd_compr_stream *cstream,
        return 0;
 }
 
-static int sof_probe_compr_free(struct snd_compr_stream *cstream,
-                               struct snd_soc_dai *dai)
+static int sof_probe_compr_shutdown(struct snd_compr_stream *cstream,
+                                   struct snd_soc_dai *dai)
 {
        struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component);
        struct sof_probe_point_desc *desc;
@@ -322,8 +322,8 @@ static int sof_probe_compr_pointer(struct snd_compr_stream *cstream,
 }
 
 struct snd_soc_cdai_ops sof_probe_compr_ops = {
-       .startup        = sof_probe_compr_open,
-       .shutdown       = sof_probe_compr_free,
+       .startup        = sof_probe_compr_startup,
+       .shutdown       = sof_probe_compr_shutdown,
        .set_params     = sof_probe_compr_set_params,
        .trigger        = sof_probe_compr_trigger,
        .pointer        = sof_probe_compr_pointer,