]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: remove unused substream in macro soc_link_mark_pop
authorHongbo Li <lihongbo22@huawei.com>
Wed, 21 Aug 2024 07:08:14 +0000 (15:08 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 29 Sep 2024 23:09:53 +0000 (01:09 +0200)
The soc_link_mark_pop don't need substream, therefore we can
remove it.

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
Link: https://patch.msgid.link/20240821070815.2326534-5-lihongbo22@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-link.c

index fee4022708bc7c465fd9033e2184f16960025a69..7f1f1bc717e2ceeeee0d375b39e63f39e8ad5a5d 100644 (file)
@@ -35,7 +35,7 @@ static inline int _soc_link_ret(struct snd_soc_pcm_runtime *rtd,
  * In such case, we can update these macros.
  */
 #define soc_link_mark_push(rtd, substream, tgt)                ((rtd)->mark_##tgt = substream)
-#define soc_link_mark_pop(rtd, substream, tgt)         ((rtd)->mark_##tgt = NULL)
+#define soc_link_mark_pop(rtd, tgt)            ((rtd)->mark_##tgt = NULL)
 #define soc_link_mark_match(rtd, substream, tgt)       ((rtd)->mark_##tgt == substream)
 
 int snd_soc_link_init(struct snd_soc_pcm_runtime *rtd)
@@ -94,7 +94,7 @@ void snd_soc_link_shutdown(struct snd_pcm_substream *substream,
                rtd->dai_link->ops->shutdown(substream);
 
        /* remove marked substream */
-       soc_link_mark_pop(rtd, substream, startup);
+       soc_link_mark_pop(rtd, startup);
 }
 
 int snd_soc_link_prepare(struct snd_pcm_substream *substream)
@@ -138,7 +138,7 @@ void snd_soc_link_hw_free(struct snd_pcm_substream *substream, int rollback)
                rtd->dai_link->ops->hw_free(substream);
 
        /* remove marked substream */
-       soc_link_mark_pop(rtd, substream, hw_params);
+       soc_link_mark_pop(rtd, hw_params);
 }
 
 static int soc_link_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -175,7 +175,7 @@ int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd,
                        break;
 
                ret = soc_link_trigger(substream, cmd);
-               soc_link_mark_pop(rtd, substream, startup);
+               soc_link_mark_pop(rtd, startup);
        }
 
        return ret;
@@ -209,7 +209,7 @@ void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream,
            rtd->dai_link->compr_ops->shutdown)
                rtd->dai_link->compr_ops->shutdown(cstream);
 
-       soc_link_mark_pop(rtd, cstream, compr_startup);
+       soc_link_mark_pop(rtd, compr_startup);
 }
 EXPORT_SYMBOL_GPL(snd_soc_link_compr_shutdown);