Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
swiotlb: rename swiotlb_late_init_with_default_size
swiotlb_late_init_with_default_size is an overly verbose name that
doesn't even catch what the function is doing, given that the size is
not just a default but the actual requested size.
Rename it to swiotlb_init_late.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+4
-6
+1
-1
arch/x86/pci/sta2x11-fixup.c
+1
-1
arch/x86/pci/sta2x11-fixup.c
···
57
57
int size = STA2X11_SWIOTLB_SIZE;
58
58
/* First instance: register your own swiotlb area */
59
59
dev_info(&pdev->dev, "Using SWIOTLB (size %i)\n", size);
60
-
if (swiotlb_late_init_with_default_size(size))
60
+
if (swiotlb_init_late(size))
61
61
dev_emerg(&pdev->dev, "init swiotlb failed\n");
62
62
}
63
63
list_add(&instance->list, &sta2x11_instance_list);
+1
-1
include/linux/swiotlb.h
+1
-1
include/linux/swiotlb.h
···
40
40
int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
41
41
unsigned long swiotlb_size_or_default(void);
42
42
extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);
43
-
extern int swiotlb_late_init_with_default_size(size_t default_size);
43
+
int swiotlb_init_late(size_t size);
44
44
extern void __init swiotlb_update_mem_attributes(void);
45
45
46
46
phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,
+2
-4
kernel/dma/swiotlb.c
+2
-4
kernel/dma/swiotlb.c
···
281
281
* initialize the swiotlb later using the slab allocator if needed.
282
282
* This should be just like above, but with some error catching.
283
283
*/
284
-
int
285
-
swiotlb_late_init_with_default_size(size_t default_size)
284
+
int swiotlb_init_late(size_t size)
286
285
{
287
-
unsigned long nslabs =
288
-
ALIGN(default_size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE);
286
+
unsigned long nslabs = ALIGN(size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE);
289
287
unsigned long bytes;
290
288
unsigned char *vstart = NULL;
291
289
unsigned int order;