diff options
author | Robin Murphy <Robin.Murphy@arm.com> | 2015-07-29 14:46:12 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-08-06 09:35:40 -0400 |
commit | f5b831907da3e64bfb0288089a5c07124266b1a5 (patch) | |
tree | abc07a5019d4f94eb761827cc6602789f8846019 /drivers/iommu | |
parent | 857c88ca62f1e2594e1e760ef9a45ec1961f2a53 (diff) |
iommu/io-pgtable: Remove flush_pgtable callback
With the users fully converted to DMA API operations, it's dead, Jim.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/io-pgtable-arm.c | 6 | ||||
-rw-r--r-- | drivers/iommu/io-pgtable.h | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 06176872fb78..e4bc2b23ab96 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c | |||
@@ -884,16 +884,10 @@ static void dummy_tlb_sync(void *cookie) | |||
884 | WARN_ON(cookie != cfg_cookie); | 884 | WARN_ON(cookie != cfg_cookie); |
885 | } | 885 | } |
886 | 886 | ||
887 | static void dummy_flush_pgtable(void *ptr, size_t size, void *cookie) | ||
888 | { | ||
889 | WARN_ON(cookie != cfg_cookie); | ||
890 | } | ||
891 | |||
892 | static struct iommu_gather_ops dummy_tlb_ops __initdata = { | 887 | static struct iommu_gather_ops dummy_tlb_ops __initdata = { |
893 | .tlb_flush_all = dummy_tlb_flush_all, | 888 | .tlb_flush_all = dummy_tlb_flush_all, |
894 | .tlb_add_flush = dummy_tlb_add_flush, | 889 | .tlb_add_flush = dummy_tlb_add_flush, |
895 | .tlb_sync = dummy_tlb_sync, | 890 | .tlb_sync = dummy_tlb_sync, |
896 | .flush_pgtable = dummy_flush_pgtable, | ||
897 | }; | 891 | }; |
898 | 892 | ||
899 | static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops) | 893 | static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops) |
diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h index e8fadb012ed2..48538a35d078 100644 --- a/drivers/iommu/io-pgtable.h +++ b/drivers/iommu/io-pgtable.h | |||
@@ -20,7 +20,6 @@ enum io_pgtable_fmt { | |||
20 | * @tlb_sync: Ensure any queued TLB invalidation has taken effect, and | 20 | * @tlb_sync: Ensure any queued TLB invalidation has taken effect, and |
21 | * any corresponding page table updates are visible to the | 21 | * any corresponding page table updates are visible to the |
22 | * IOMMU. | 22 | * IOMMU. |
23 | * @flush_pgtable: Ensure page table updates are visible to the IOMMU. | ||
24 | * | 23 | * |
25 | * Note that these can all be called in atomic context and must therefore | 24 | * Note that these can all be called in atomic context and must therefore |
26 | * not block. | 25 | * not block. |
@@ -30,7 +29,6 @@ struct iommu_gather_ops { | |||
30 | void (*tlb_add_flush)(unsigned long iova, size_t size, bool leaf, | 29 | void (*tlb_add_flush)(unsigned long iova, size_t size, bool leaf, |
31 | void *cookie); | 30 | void *cookie); |
32 | void (*tlb_sync)(void *cookie); | 31 | void (*tlb_sync)(void *cookie); |
33 | void (*flush_pgtable)(void *ptr, size_t size, void *cookie); | ||
34 | }; | 32 | }; |
35 | 33 | ||
36 | /** | 34 | /** |