iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/shmobile: Use devm_ioremap_resource()

Browse Source 
Replace the devm_ioremap_nocache() call with devm_ioremap_resource().
This simplifies error checking.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2014-02-21 16:54:53 +01:00
parent ac1ef1fed3
commit b11762f843
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/iommu/shmobile-ipmmu.c
View File

@ -94,11 +94,6 @@ static int ipmmu_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
struct shmobile_ipmmu_platform_data *pdata = pdev->dev.platform_data; struct shmobile_ipmmu_platform_data *pdata = pdev->dev.platform_data;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "cannot get platform resources\n");
return -ENOENT;
}
ipmmu = devm_kzalloc(&pdev->dev, sizeof(*ipmmu), GFP_KERNEL); ipmmu = devm_kzalloc(&pdev->dev, sizeof(*ipmmu), GFP_KERNEL);
if (!ipmmu) { if (!ipmmu) {
dev_err(&pdev->dev, "cannot allocate device data\n"); dev_err(&pdev->dev, "cannot allocate device data\n");
@ -106,12 +101,12 @@ static int ipmmu_probe(struct platform_device *pdev)
} }
spin_lock_init(&ipmmu->flush_lock); spin_lock_init(&ipmmu->flush_lock);
ipmmu->dev = &pdev->dev; ipmmu->dev = &pdev->dev;
ipmmu->ipmmu_base = devm_ioremap_nocache(&pdev->dev, res->start,
resource_size(res)); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!ipmmu->ipmmu_base) { ipmmu->ipmmu_base = devm_ioremap_resource(&pdev->dev, res);
dev_err(&pdev->dev, "ioremap_nocache failed\n"); if (IS_ERR(ipmmu->ipmmu_base))
return -ENOMEM; return PTR_ERR(ipmmu->ipmmu_base);
}
ipmmu->dev_names = pdata->dev_names; ipmmu->dev_names = pdata->dev_names;
ipmmu->num_dev_names = pdata->num_dev_names; ipmmu->num_dev_names = pdata->num_dev_names;
platform_set_drvdata(pdev, ipmmu); platform_set_drvdata(pdev, ipmmu);