|
@@ -146,13 +146,10 @@ static int iommu_enable(struct omap_iommu *obj)
|
|
|
struct platform_device *pdev = to_platform_device(obj->dev);
|
|
|
struct iommu_platform_data *pdata = pdev->dev.platform_data;
|
|
|
|
|
|
- if (!pdata)
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
if (!arch_iommu)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- if (pdata->deassert_reset) {
|
|
|
+ if (pdata && pdata->deassert_reset) {
|
|
|
err = pdata->deassert_reset(pdev, pdata->reset_name);
|
|
|
if (err) {
|
|
|
dev_err(obj->dev, "deassert_reset failed: %d\n", err);
|
|
@@ -172,14 +169,11 @@ static void iommu_disable(struct omap_iommu *obj)
|
|
|
struct platform_device *pdev = to_platform_device(obj->dev);
|
|
|
struct iommu_platform_data *pdata = pdev->dev.platform_data;
|
|
|
|
|
|
- if (!pdata)
|
|
|
- return;
|
|
|
-
|
|
|
arch_iommu->disable(obj);
|
|
|
|
|
|
pm_runtime_put_sync(obj->dev);
|
|
|
|
|
|
- if (pdata->assert_reset)
|
|
|
+ if (pdata && pdata->assert_reset)
|
|
|
pdata->assert_reset(pdev, pdata->reset_name);
|
|
|
}
|
|
|
|