diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-05-11 13:35:52 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-05-11 13:35:52 +0200 |
| commit | c55b44c9386f3ee1b08752638559f19deaf6040d (patch) | |
| tree | c843a21f45180387fcd9eb2625cc9d1f166a3156 /drivers/iommu/msm_iommu.c | |
| parent | MAINTAINERS: Update my e-mail (diff) | |
| parent | Linux 5.13-rc1 (diff) | |
| download | linux-c55b44c9386f3ee1b08752638559f19deaf6040d.tar.xz linux-c55b44c9386f3ee1b08752638559f19deaf6040d.zip | |
Merge drm/drm-fixes into drm-misc-fixes
Start this new release drm-misc-fixes branch
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/iommu/msm_iommu.c')
| -rw-r--r-- | drivers/iommu/msm_iommu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index f0ba6a09b434..7880f307cb2d 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -792,10 +792,7 @@ static int msm_iommu_probe(struct platform_device *pdev) goto fail; } - iommu_device_set_ops(&iommu->iommu, &msm_iommu_ops); - iommu_device_set_fwnode(&iommu->iommu, &pdev->dev.of_node->fwnode); - - ret = iommu_device_register(&iommu->iommu); + ret = iommu_device_register(&iommu->iommu, &msm_iommu_ops, &pdev->dev); if (ret) { pr_err("Could not register msm-smmu at %pa\n", &ioaddr); goto fail; |