90 lines
3.0 KiB
Diff
90 lines
3.0 KiB
Diff
From 00f24490f498db0ea67715a4dfe6c4a6ca11c6a0 Mon Sep 17 00:00:00 2001
|
|
From: Junlin Yang <yangjunlin@yulong.com>
|
|
Date: Thu, 8 Apr 2021 22:33:22 +0800
|
|
Subject: [PATCH 07/16] remoteproc: qcom: wcss: Remove unnecessary PTR_ERR()
|
|
|
|
Remove unnecessary PTR_ERR(), it has been assigned to ret before,
|
|
so return ret directly.
|
|
|
|
Signed-off-by: Junlin Yang <yangjunlin@yulong.com>
|
|
Link: https://lore.kernel.org/r/20210408143322.1647-1-angkery@163.com
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
---
|
|
drivers/remoteproc/qcom_q6v5_wcss.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
@@ -913,7 +913,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->gcc_abhs_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get gcc abhs clock");
|
|
- return PTR_ERR(wcss->gcc_abhs_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->gcc_axim_cbcr = devm_clk_get(wcss->dev, "gcc_axim_cbcr");
|
|
@@ -921,7 +921,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->gcc_axim_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get gcc axim clock\n");
|
|
- return PTR_ERR(wcss->gcc_axim_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->ahbfabric_cbcr_clk = devm_clk_get(wcss->dev,
|
|
@@ -930,7 +930,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->ahbfabric_cbcr_clk);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get ahbfabric clock\n");
|
|
- return PTR_ERR(wcss->ahbfabric_cbcr_clk);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->lcc_csr_cbcr = devm_clk_get(wcss->dev, "tcsr_lcc_cbc");
|
|
@@ -938,7 +938,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->lcc_csr_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get csr cbcr clk\n");
|
|
- return PTR_ERR(wcss->lcc_csr_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->ahbs_cbcr = devm_clk_get(wcss->dev,
|
|
@@ -947,7 +947,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->ahbs_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get ahbs_cbcr clk\n");
|
|
- return PTR_ERR(wcss->ahbs_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->tcm_slave_cbcr = devm_clk_get(wcss->dev,
|
|
@@ -956,7 +956,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->tcm_slave_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get tcm cbcr clk\n");
|
|
- return PTR_ERR(wcss->tcm_slave_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->qdsp6ss_abhm_cbcr = devm_clk_get(wcss->dev, "lcc_abhm_cbc");
|
|
@@ -964,7 +964,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->qdsp6ss_abhm_cbcr);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get abhm cbcr clk\n");
|
|
- return PTR_ERR(wcss->qdsp6ss_abhm_cbcr);
|
|
+ return ret;
|
|
}
|
|
|
|
wcss->qdsp6ss_axim_cbcr = devm_clk_get(wcss->dev, "lcc_axim_cbc");
|
|
@@ -980,7 +980,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
ret = PTR_ERR(wcss->lcc_bcr_sleep);
|
|
if (ret != -EPROBE_DEFER)
|
|
dev_err(wcss->dev, "failed to get bcr cbcr clk\n");
|
|
- return PTR_ERR(wcss->lcc_bcr_sleep);
|
|
+ return ret;
|
|
}
|
|
|
|
return 0;
|