ASoC: q6asm: rename misleading session id variable

Each q6asm session can have multiple streams, mixing usage of these
names in variable are bit misleading to reader, so rename them accordingly.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200727093806.17089-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
index 755062eadcc85ef9ca53e507ec91f0b9a518086c..b543d77b25245d5846b3f4d151b17e7bbb7d9bbb 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm.c
+++ b/sound/soc/qcom/qdsp6/q6asm.c
@@ -828,21 +828,21 @@ EXPORT_SYMBOL_GPL(q6asm_get_session_id);
  * @dev: Pointer to asm child device.
  * @cb: event callback.
  * @priv: private data associated with this client.
- * @stream_id: stream id
+ * @session_id: session id
  * @perf_mode: performace mode for this client
  *
  * Return: Will be an error pointer on error or a valid audio client
  * on success.
  */
 struct audio_client *q6asm_audio_client_alloc(struct device *dev, q6asm_cb cb,
-                                             void *priv, int stream_id,
+                                             void *priv, int session_id,
                                              int perf_mode)
 {
        struct q6asm *a = dev_get_drvdata(dev->parent);
        struct audio_client *ac;
        unsigned long flags;
 
-       ac = q6asm_get_audio_client(a, stream_id + 1);
+       ac = q6asm_get_audio_client(a, session_id + 1);
        if (ac) {
                dev_err(dev, "Audio Client already active\n");
                return ac;
@@ -853,9 +853,9 @@ struct audio_client *q6asm_audio_client_alloc(struct device *dev, q6asm_cb cb,
                return ERR_PTR(-ENOMEM);
 
        spin_lock_irqsave(&a->slock, flags);
-       a->session[stream_id + 1] = ac;
+       a->session[session_id + 1] = ac;
        spin_unlock_irqrestore(&a->slock, flags);
-       ac->session = stream_id + 1;
+       ac->session = session_id + 1;
        ac->cb = cb;
        ac->dev = dev;
        ac->q6asm = a;