[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1585663188-114303-1-git-send-email-zhangliguang@linux.alibaba.com>
Date: Tue, 31 Mar 2020 21:59:48 +0800
From: luanshi <zhangliguang@...ux.alibaba.com>
To: Will Deacon <will@...nel.org>, Robin Murphy <robin.murphy@....com>,
Joerg Roedel <joro@...tes.org>
Cc: linux-arm-kernel@...ts.infradead.org,
iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org
Subject: [PATCH] iommu/arm-smmu-v3: move error checking into common path
Move error checking into common path to be consistent with
drivers/iommu/arm-smmu.c.
Signed-off-by: Liguang Zhang <zhangliguang@...ux.alibaba.com>
---
drivers/iommu/arm-smmu-v3.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index aa3ac2a..970f1c9 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -3889,13 +3889,13 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
}
smmu->dev = dev;
- if (dev->of_node) {
+ if (dev->of_node)
ret = arm_smmu_device_dt_probe(pdev, smmu);
- } else {
+ else
ret = arm_smmu_device_acpi_probe(pdev, smmu);
- if (ret == -ENODEV)
- return ret;
- }
+
+ if (ret)
+ return ret;
/* Set bypass mode according to firmware probing result */
bypass = !!ret;
--
1.8.3.1
Powered by blists - more mailing lists