diff options
| author | Joerg Roedel <joro@8bytes.org> | 2014-05-12 20:45:58 +0200 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2014-05-12 20:45:58 +0200 |
| commit | 9db4241e83f6d78321f5e95a1721c4158220021f (patch) | |
| tree | ebe2b041ec2531b634c1c0a294926b658547c863 /drivers/iommu | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| parent | b11762f8431b3a5cf1c156876e79efab7d7f80c4 (diff) | |
| download | op-kernel-dev-9db4241e83f6d78321f5e95a1721c4158220021f.zip op-kernel-dev-9db4241e83f6d78321f5e95a1721c4158220021f.tar.gz | |
Merge branch 'iommu/for-v3.16' of git://linuxtv.org/pinchartl/fbdev into arm/shmobile
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/shmobile-ipmmu.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/iommu/shmobile-ipmmu.c b/drivers/iommu/shmobile-ipmmu.c index e3bc2e1..bd97ade 100644 --- a/drivers/iommu/shmobile-ipmmu.c +++ b/drivers/iommu/shmobile-ipmmu.c @@ -94,11 +94,6 @@ static int ipmmu_probe(struct platform_device *pdev) struct resource *res; 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); if (!ipmmu) { dev_err(&pdev->dev, "cannot allocate device data\n"); @@ -106,19 +101,18 @@ static int ipmmu_probe(struct platform_device *pdev) } spin_lock_init(&ipmmu->flush_lock); ipmmu->dev = &pdev->dev; - ipmmu->ipmmu_base = devm_ioremap_nocache(&pdev->dev, res->start, - resource_size(res)); - if (!ipmmu->ipmmu_base) { - dev_err(&pdev->dev, "ioremap_nocache failed\n"); - return -ENOMEM; - } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ipmmu->ipmmu_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ipmmu->ipmmu_base)) + return PTR_ERR(ipmmu->ipmmu_base); + ipmmu->dev_names = pdata->dev_names; ipmmu->num_dev_names = pdata->num_dev_names; platform_set_drvdata(pdev, ipmmu); ipmmu_reg_write(ipmmu, IMCTR1, 0x0); /* disable TLB */ ipmmu_reg_write(ipmmu, IMCTR2, 0x0); /* disable PMB */ - ipmmu_iommu_init(ipmmu); - return 0; + return ipmmu_iommu_init(ipmmu); } static struct platform_driver ipmmu_driver = { |
