| Message ID | 20231120190740.339350-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5c68b66d4d7eff8cdb6f508f8537faa30c5faa6d |
| Headers | show |
| Series | [1/2] soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup | expand |
On 11/20/23 20:07, Krzysztof Kozlowski wrote: > 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> Konrad
On Mon, 20 Nov 2023 20:07:39 +0100, Krzysztof Kozlowski wrote: > 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. > > Applied, thanks! [1/2] soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup commit: 5c68b66d4d7eff8cdb6f508f8537faa30c5faa6d [2/2] soundwire: qcom: move sconfig in qcom_swrm_stream_alloc_ports() out of critical section commit: 5bdc61ef45007908df9d8587111c7a5a552bdd46 Best regards,
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index a1e2d6c98186..754870a4a047 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -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;
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> --- drivers/soundwire/qcom.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)