Skip to content

Commit b169a18

Browse files
rmurphy-armjoergroedel
authored andcommitted
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 <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/a5a3cbf95c3279982e378cc43dad830322a59868.1668100209.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent b9bf41e commit b169a18

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

include/linux/io-pgtable.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,17 @@ struct io_pgtable_cfg {
150150
/**
151151
* struct io_pgtable_ops - Page table manipulation API for IOMMU drivers.
152152
*
153-
* @map: Map a physically contiguous memory region.
154153
* @map_pages: Map a physically contiguous range of pages of the same size.
155-
* @unmap: Unmap a physically contiguous memory region.
156154
* @unmap_pages: Unmap a range of virtually contiguous pages of the same size.
157155
* @iova_to_phys: Translate iova to physical address.
158156
*
159157
* These functions map directly onto the iommu_ops member functions with
160158
* the same names.
161159
*/
162160
struct io_pgtable_ops {
163-
int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
164-
phys_addr_t paddr, size_t size, int prot, gfp_t gfp);
165161
int (*map_pages)(struct io_pgtable_ops *ops, unsigned long iova,
166162
phys_addr_t paddr, size_t pgsize, size_t pgcount,
167163
int prot, gfp_t gfp, size_t *mapped);
168-
size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
169-
size_t size, struct iommu_iotlb_gather *gather);
170164
size_t (*unmap_pages)(struct io_pgtable_ops *ops, unsigned long iova,
171165
size_t pgsize, size_t pgcount,
172166
struct iommu_iotlb_gather *gather);

0 commit comments

Comments
 (0)