diff options
| author | Mitchel Humpherys <mitchelh@codeaurora.org> | 2015-05-21 14:11:22 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:12:44 -0700 |
| commit | eb0c3e8d4bd78df1fca15378e047b7633b22fc22 (patch) | |
| tree | 9f834efd4b4dd5c41099161450762f0e8144ca5d | |
| parent | 8ccd9255d49efab7aee530417a6eb647def37abb (diff) | |
iommu: io-pgtable: use size_t for unmap return value
Unmap returns a size_t all throughout the IOMMU framework. Make
io-pgtable match this convention.
Change-Id: Ice4c75a428f0f95a665e2fbe4210349d6f78c220
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
| -rw-r--r-- | drivers/iommu/io-pgtable-arm.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/io-pgtable.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 99d69bd501da..a2fcc997d657 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -541,7 +541,7 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep); } -static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova, +static size_t arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova, size_t size) { size_t unmapped; diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h index 4428266e0f6d..2700aa6d1a83 100644 --- a/drivers/iommu/io-pgtable.h +++ b/drivers/iommu/io-pgtable.h @@ -81,9 +81,9 @@ struct io_pgtable_ops { int (*map)(struct io_pgtable_ops *ops, unsigned long iova, phys_addr_t paddr, size_t size, int prot); int (*map_sg)(struct io_pgtable_ops *ops, unsigned long iova, - struct scatterlist *sg, unsigned int nents, int prot); - int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova, - size_t size); + struct scatterlist *sg, unsigned int nents, int prot); + size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova, + size_t size); phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops, unsigned long iova); }; |