From eb0c3e8d4bd78df1fca15378e047b7633b22fc22 Mon Sep 17 00:00:00 2001 From: Mitchel Humpherys Date: Thu, 21 May 2015 14:11:22 -0700 Subject: 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 --- drivers/iommu/io-pgtable-arm.c | 2 +- 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); }; -- cgit v1.2.3