diff options
author | Joerg Roedel <jroedel@suse.de> | 2014-09-05 04:50:27 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2014-09-25 09:47:37 -0400 |
commit | b7eb67858562c053c314dee264c425e8214c2bfb (patch) | |
tree | 6cdd7f9ba34c2e78f9c44d1c64fa310b8049b58a | |
parent | 1fd0c775a573646eec972a3f40563506e33d9f8a (diff) |
iommu/fsl: Convert to iommu_capable() API function
Cc: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | drivers/iommu/fsl_pamu_domain.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index 56feed7cec15..c828f80d48b0 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c | |||
@@ -411,8 +411,7 @@ static phys_addr_t fsl_pamu_iova_to_phys(struct iommu_domain *domain, | |||
411 | return get_phys_addr(dma_domain, iova); | 411 | return get_phys_addr(dma_domain, iova); |
412 | } | 412 | } |
413 | 413 | ||
414 | static int fsl_pamu_domain_has_cap(struct iommu_domain *domain, | 414 | static bool fsl_pamu_capable(enum iommu_cap cap) |
415 | unsigned long cap) | ||
416 | { | 415 | { |
417 | return cap == IOMMU_CAP_CACHE_COHERENCY; | 416 | return cap == IOMMU_CAP_CACHE_COHERENCY; |
418 | } | 417 | } |
@@ -1080,6 +1079,7 @@ static u32 fsl_pamu_get_windows(struct iommu_domain *domain) | |||
1080 | } | 1079 | } |
1081 | 1080 | ||
1082 | static const struct iommu_ops fsl_pamu_ops = { | 1081 | static const struct iommu_ops fsl_pamu_ops = { |
1082 | .capable = fsl_pamu_capable, | ||
1083 | .domain_init = fsl_pamu_domain_init, | 1083 | .domain_init = fsl_pamu_domain_init, |
1084 | .domain_destroy = fsl_pamu_domain_destroy, | 1084 | .domain_destroy = fsl_pamu_domain_destroy, |
1085 | .attach_dev = fsl_pamu_attach_device, | 1085 | .attach_dev = fsl_pamu_attach_device, |
@@ -1089,7 +1089,6 @@ static const struct iommu_ops fsl_pamu_ops = { | |||
1089 | .domain_get_windows = fsl_pamu_get_windows, | 1089 | .domain_get_windows = fsl_pamu_get_windows, |
1090 | .domain_set_windows = fsl_pamu_set_windows, | 1090 | .domain_set_windows = fsl_pamu_set_windows, |
1091 | .iova_to_phys = fsl_pamu_iova_to_phys, | 1091 | .iova_to_phys = fsl_pamu_iova_to_phys, |
1092 | .domain_has_cap = fsl_pamu_domain_has_cap, | ||
1093 | .domain_set_attr = fsl_pamu_set_domain_attr, | 1092 | .domain_set_attr = fsl_pamu_set_domain_attr, |
1094 | .domain_get_attr = fsl_pamu_get_domain_attr, | 1093 | .domain_get_attr = fsl_pamu_get_domain_attr, |
1095 | .add_device = fsl_pamu_add_device, | 1094 | .add_device = fsl_pamu_add_device, |