Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e050591 authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by Patrick Daly
Browse files

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: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 5123b492

drivers/iommu/io-pgtable-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,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;

drivers/iommu/io-pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct io_pgtable_ops { 
	int (*map_sg)(struct io_pgtable_ops *ops, unsigned long iova,

		      struct scatterlist *sg, unsigned int nents,

		      int prot, size_t *size);

	int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,

	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);