diff options
| author | Robin Murphy <Robin.Murphy@arm.com> | 2014-12-05 13:41:02 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-11-07 21:52:46 +0800 |
| commit | de1cf2e59c396d36e14ba52d44e199446acd13eb (patch) | |
| tree | fb2adba90fa167a573730d0f53c75f2be3aa248f /include | |
| parent | 7db9fc8a6ac66795babb7f039af442e800e91a57 (diff) | |
iommu: store DT-probed IOMMU data privately
Since the data pointer in the DT node is public and may be overwritten
by conflicting code, move the DT-probed IOMMU ops to a private list
where they will be safe.
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
[will: added missing #include and missing ')']
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit a42a7a1fb5f1f9004b023594609dc22da02fc08b)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_iommu.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h index d03abbb11c34..16c75547d725 100644 --- a/include/linux/of_iommu.h +++ b/include/linux/of_iommu.h @@ -31,16 +31,8 @@ static inline struct iommu_ops *of_iommu_configure(struct device *dev) #endif /* CONFIG_OF_IOMMU */ -static inline void of_iommu_set_ops(struct device_node *np, - const struct iommu_ops *ops) -{ - np->data = (struct iommu_ops *)ops; -} - -static inline struct iommu_ops *of_iommu_get_ops(struct device_node *np) -{ - return np->data; -} +void of_iommu_set_ops(struct device_node *np, struct iommu_ops *ops); +struct iommu_ops *of_iommu_get_ops(struct device_node *np); extern struct of_device_id __iommu_of_table; |