iommu/arm-smmu-v3: Convert struct device of_node to fwnode usage

[karo-tx-linux.git] / drivers / iommu / arm-smmu-v3.c

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 13ac9d896e3e1caae8e0d6fb77091251fb2e3a83..1406e1fd38478bd6c7e78a0e8cd95acdd2d793af 100644 (file)
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1723,13 +1723,14 @@ static struct platform_driver arm_smmu_driver;
 
 static int arm_smmu_match_node(struct device *dev, void *data)
 {
-       return dev->of_node == data;
+       return dev->fwnode == data;
 }
 
-static struct arm_smmu_device *arm_smmu_get_by_node(struct device_node *np)
+static
+struct arm_smmu_device *arm_smmu_get_by_fwnode(struct fwnode_handle *fwnode)
 {
        struct device *dev = driver_find_device(&arm_smmu_driver.driver, NULL,
-                                               np, arm_smmu_match_node);
+                                               fwnode, arm_smmu_match_node);
        put_device(dev);
        return dev ? dev_get_drvdata(dev) : NULL;
 }
@@ -1765,7 +1766,7 @@ static int arm_smmu_add_device(struct device *dev)
                master = fwspec->iommu_priv;
                smmu = master->smmu;
        } else {
-               smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
+               smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
                if (!smmu)
                        return -ENODEV;
                master = kzalloc(sizeof(*master), GFP_KERNEL);
@@ -2634,7 +2635,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
                return ret;
 
        /* And we're up. Go go go! */
-       of_iommu_set_ops(dev->of_node, &arm_smmu_ops);
+       iommu_register_instance(dev->fwnode, &arm_smmu_ops);
+
 #ifdef CONFIG_PCI
        if (pci_bus_type.iommu_ops != &arm_smmu_ops) {
                pci_request_acs();