soundwire: qcom: move sconfig in qcom_swrm_stream_alloc_ports() out of critical section
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 20 Nov 2023 19:07:40 +0000 (20:07 +0100)
committerVinod Koul <vkoul@kernel.org>
Thu, 23 Nov 2023 06:54:37 +0000 (12:24 +0530)
Setting members of local variable "sconfig" in
qcom_swrm_stream_alloc_ports() does not depend on any earlier code in
this function, so can be moved up before the critical section.  This
makes the code a bit easier to follow because critical section is
smaller.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20231120190740.339350-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/qcom.c

index 754870a4a047cef7f39b49f4fec1f983dbba439c..e9a52c1bd3594ba3543d192b0d62f91bf43382ff 100644 (file)
@@ -1160,6 +1160,17 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
        int maxport, pn, nports = 0, ret = 0;
        unsigned int m_port;
 
+       if (direction == SNDRV_PCM_STREAM_CAPTURE)
+               sconfig.direction = SDW_DATA_DIR_TX;
+       else
+               sconfig.direction = SDW_DATA_DIR_RX;
+
+       /* hw parameters wil be ignored as we only support PDM */
+       sconfig.ch_count = 1;
+       sconfig.frame_rate = params_rate(params);
+       sconfig.type = stream->type;
+       sconfig.bps = 1;
+
        mutex_lock(&ctrl->port_lock);
        list_for_each_entry(m_rt, &stream->master_list, stream_node) {
                if (m_rt->direction == SDW_DATA_DIR_RX) {
@@ -1193,16 +1204,6 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
                }
        }
 
-       if (direction == SNDRV_PCM_STREAM_CAPTURE)
-               sconfig.direction = SDW_DATA_DIR_TX;
-       else
-               sconfig.direction = SDW_DATA_DIR_RX;
-
-       /* hw parameters wil be ignored as we only support PDM */
-       sconfig.ch_count = 1;
-       sconfig.frame_rate = params_rate(params);
-       sconfig.type = stream->type;
-       sconfig.bps = 1;
        sdw_stream_add_master(&ctrl->bus, &sconfig, pconfig,
                              nports, stream);
 out: