iommu/mediatek: Use helper functions to access dev->iommu_fwspec

[linux.git] / drivers / iommu / mtk_iommu.c

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 44bd5b9166bbfd2b6022ae22f20a88eae0058225..0783fba05d195bbcfa09e1c2ede1181b5b85b4fb 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -244,7 +244,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
 {
        struct mtk_smi_larb_iommu    *larb_mmu;
        unsigned int                 larbid, portid;
-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        int i;
 
        for (i = 0; i < fwspec->num_ids; ++i) {
@@ -336,7 +336,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
                                   struct device *dev)
 {
        struct mtk_iommu_domain *dom = to_mtk_domain(domain);
-       struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv;
+       struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
 
        if (!data)
                return -ENODEV;
@@ -355,7 +355,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 static void mtk_iommu_detach_device(struct iommu_domain *domain,
                                    struct device *dev)
 {
-       struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv;
+       struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
 
        if (!data)
                return;
@@ -417,13 +417,14 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
 
 static int mtk_iommu_add_device(struct device *dev)
 {
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct mtk_iommu_data *data;
        struct iommu_group *group;
 
-       if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops)
+       if (!fwspec || fwspec->ops != &mtk_iommu_ops)
                return -ENODEV; /* Not a iommu client device */
 
-       data = dev->iommu_fwspec->iommu_priv;
+       data = fwspec->iommu_priv;
        iommu_device_link(&data->iommu, dev);
 
        group = iommu_group_get_for_dev(dev);
@@ -436,12 +437,13 @@ static int mtk_iommu_add_device(struct device *dev)
 
 static void mtk_iommu_remove_device(struct device *dev)
 {
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct mtk_iommu_data *data;
 
-       if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops)
+       if (!fwspec || fwspec->ops != &mtk_iommu_ops)
                return;
 
-       data = dev->iommu_fwspec->iommu_priv;
+       data = fwspec->iommu_priv;
        iommu_device_unlink(&data->iommu, dev);
 
        iommu_group_remove_device(dev);
@@ -468,6 +470,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)
 
 static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
 {
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct platform_device *m4updev;
 
        if (args->args_count != 1) {
@@ -476,13 +479,13 @@ static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
                return -EINVAL;
        }
 
-       if (!dev->iommu_fwspec->iommu_priv) {
+       if (!fwspec->iommu_priv) {
                /* Get the m4u device */
                m4updev = of_find_device_by_node(args->np);
                if (WARN_ON(!m4updev))
                        return -EINVAL;
 
-               dev->iommu_fwspec->iommu_priv = platform_get_drvdata(m4updev);
+               fwspec->iommu_priv = platform_get_drvdata(m4updev);
        }
 
        return iommu_fwspec_add_ids(dev, args->args, 1);