Commit 8b9cc3b7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/rockchip: Use dev_iommu_priv_get/set() 



Remove the use of dev->archdata.iommu and use the private per-device
pointer provided by IOMMU core code instead.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20200625130836.1916-6-joro@8bytes.org
parent 97ea1202

drivers/iommu/rockchip-iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static size_t rk_iommu_unmap(struct iommu_domain *domain, unsigned long _iova, 


static struct rk_iommu *rk_iommu_from_dev(struct device *dev)

{

	struct rk_iommudata *data = dev->archdata.iommu;

	struct rk_iommudata *data = dev_iommu_priv_get(dev);



	return data ? data->iommu : NULL;

}
@@ -1059,7 +1059,7 @@ static struct iommu_device *rk_iommu_probe_device(struct device *dev) 
	struct rk_iommudata *data;

	struct rk_iommu *iommu;



	data = dev->archdata.iommu;

	data = dev_iommu_priv_get(dev);

	if (!data)

		return ERR_PTR(-ENODEV);
@@ -1073,7 +1073,7 @@ static struct iommu_device *rk_iommu_probe_device(struct device *dev) 


static void rk_iommu_release_device(struct device *dev)

{

	struct rk_iommudata *data = dev->archdata.iommu;

	struct rk_iommudata *data = dev_iommu_priv_get(dev);



	device_link_del(data->link);

}
@@ -1100,7 +1100,7 @@ static int rk_iommu_of_xlate(struct device *dev, 
	iommu_dev = of_find_device_by_node(args->np);



	data->iommu = platform_get_drvdata(iommu_dev);

	dev->archdata.iommu = data;

	dev_iommu_priv_set(dev, data);



	platform_device_put(iommu_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE