Commit 0a8c264d authored by Yangtao Li's avatar Yangtao Li Committed by Will Deacon
Browse files

iommu/arm-smmu: Clean up resource handling during Qualcomm context probe 



Convert to use devm_platform_ioremap_resource() and fix return value
when platform_get_irq fails.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230705130416.46710-1-frank.li@vivo.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 1672730c

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+2 −4
Original line number Diff line number Diff line
@@ -633,7 +633,6 @@ static int qcom_iommu_ctx_probe(struct platform_device *pdev) 
	struct qcom_iommu_ctx *ctx;

	struct device *dev = &pdev->dev;

	struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev->parent);

	struct resource *res;

	int ret, irq;



	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
@@ -643,14 +642,13 @@ static int qcom_iommu_ctx_probe(struct platform_device *pdev) 
	ctx->dev = dev;

	platform_set_drvdata(pdev, ctx);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->base = devm_ioremap_resource(dev, res);

	ctx->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ctx->base))

		return PTR_ERR(ctx->base);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

		return -ENODEV;

		return irq;



	/* clear IRQs before registering fault handler, just in case the

	 * boot-loader left us a surprise: