X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fremoteproc%2Fqcom_q6v5_pil.c;h=24791886219a2b7c61cadc34d1e29e7e814390db;hb=71e11aff34510e4133965d63ae6d91a0cf4aa876;hp=fb4c56cc6dfc39a60eb08f270eefd5d78e22df05;hpb=051fb70fd4ea40fbc7139186a4890b2fe5cb1e76;p=deliverable%2Flinux.git

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index fb4c56cc6dfc..24791886219a 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -386,7 +386,6 @@ static int q6v5_mpss_validate(struct q6v5 *qproc, const struct firmware *fw)
 	phys_addr_t fw_addr;
 	bool relocate;
 	size_t size;
-	u32 val;
 	int ret;
 	int i;
 
@@ -425,8 +424,13 @@ static int q6v5_mpss_validate(struct q6v5 *qproc, const struct firmware *fw)
 		writel(size, qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG);
 	}
 
-	val = readl(qproc->rmb_base + RMB_MBA_STATUS_REG);
-	return val < 0 ? val : 0;
+	ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_AUTH_COMPLETE, 10000);
+	if (ret == -ETIMEDOUT)
+		dev_err(qproc->dev, "MPSS authentication timed out\n");
+	else if (ret < 0)
+		dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret);
+
+	return ret < 0 ? ret : 0;
 }
 
 static int q6v5_mpss_load(struct q6v5 *qproc)
@@ -463,14 +467,6 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
 		goto release_firmware;
 
 	ret = q6v5_mpss_validate(qproc, fw);
-	if (ret)
-		goto release_firmware;
-
-	ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_AUTH_COMPLETE, 10000);
-	if (ret == -ETIMEDOUT)
-		dev_err(qproc->dev, "MPSS authentication timed out\n");
-	else if (ret < 0)
-		dev_err(qproc->dev, "MPSS authentication failed: %d\n", ret);
 
 release_firmware:
 	release_firmware(fw);
@@ -680,17 +676,13 @@ static int q6v5_init_mem(struct q6v5 *qproc, struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qdsp6");
 	qproc->reg_base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(qproc->reg_base)) {
-		dev_err(qproc->dev, "failed to get qdsp6_base\n");
+	if (IS_ERR(qproc->reg_base))
 		return PTR_ERR(qproc->reg_base);
-	}
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
 	qproc->rmb_base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(qproc->rmb_base)) {
-		dev_err(qproc->dev, "failed to get rmb_base\n");
+	if (IS_ERR(qproc->rmb_base))
 		return PTR_ERR(qproc->rmb_base);
-	}
 
 	ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node,
 					       "qcom,halt-regs", 3, 0, &args);