soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 20 Nov 2023 19:07:39 +0000 (20:07 +0100)
committerVinod Koul <vkoul@kernel.org>
Thu, 23 Nov 2023 06:54:37 +0000 (12:24 +0530)
The cleanup in "err" goto label clears bits from pconfig array which is
a local variable.  This does not have any effect outside of this
function, so drop this useless code.

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-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/qcom.c

index a1e2d6c98186288030d877034ed4e86575bb6c92..754870a4a047cef7f39b49f4fec1f983dbba439c 100644 (file)
@@ -1157,7 +1157,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
        struct sdw_port_runtime *p_rt;
        struct sdw_slave *slave;
        unsigned long *port_mask;
-       int i, maxport, pn, nports = 0, ret = 0;
+       int maxport, pn, nports = 0, ret = 0;
        unsigned int m_port;
 
        mutex_lock(&ctrl->port_lock);
@@ -1183,7 +1183,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
                                if (pn > maxport) {
                                        dev_err(ctrl->dev, "All ports busy\n");
                                        ret = -EBUSY;
-                                       goto err;
+                                       goto out;
                                }
                                set_bit(pn, port_mask);
                                pconfig[nports].num = pn;
@@ -1205,12 +1205,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
        sconfig.bps = 1;
        sdw_stream_add_master(&ctrl->bus, &sconfig, pconfig,
                              nports, stream);
-err:
-       if (ret) {
-               for (i = 0; i < nports; i++)
-                       clear_bit(pconfig[i].num, port_mask);
-       }
-
+out:
        mutex_unlock(&ctrl->port_lock);
 
        return ret;