Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iommu/io-pgtable: Remove map/unmap

With all users now calling {map,unmap}_pages, retire the redundant
single-page callbacks.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/a5a3cbf95c3279982e378cc43dad830322a59868.1668100209.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

authored by

Robin Murphy and committed by
Joerg Roedel
b169a180 b9bf41e2

-6
-6
include/linux/io-pgtable.h
··· 150 150 /** 151 151 * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers. 152 152 * 153 - * @map: Map a physically contiguous memory region. 154 153 * @map_pages: Map a physically contiguous range of pages of the same size. 155 - * @unmap: Unmap a physically contiguous memory region. 156 154 * @unmap_pages: Unmap a range of virtually contiguous pages of the same size. 157 155 * @iova_to_phys: Translate iova to physical address. 158 156 * ··· 158 160 * the same names. 159 161 */ 160 162 struct io_pgtable_ops { 161 - int (*map)(struct io_pgtable_ops *ops, unsigned long iova, 162 - phys_addr_t paddr, size_t size, int prot, gfp_t gfp); 163 163 int (*map_pages)(struct io_pgtable_ops *ops, unsigned long iova, 164 164 phys_addr_t paddr, size_t pgsize, size_t pgcount, 165 165 int prot, gfp_t gfp, size_t *mapped); 166 - size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova, 167 - size_t size, struct iommu_iotlb_gather *gather); 168 166 size_t (*unmap_pages)(struct io_pgtable_ops *ops, unsigned long iova, 169 167 size_t pgsize, size_t pgcount, 170 168 struct iommu_iotlb_gather *gather);