Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5e6dea authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

iommu: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4ed6025

drivers/iommu/tegra-smmu.c

+4 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#define pr_fmt(fmt)	"%s(): " fmt, __func__



#include <linux/err.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>
@@ -1176,9 +1177,9 @@ static int tegra_smmu_probe(struct platform_device *pdev) 
		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		if (!res)

			return -ENODEV;

		smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);

		if (!smmu->regs[i])

			return -EBUSY;

		smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(smmu->regs[i]))

			return PTR_ERR(smmu->regs[i]);

	}



	err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);