Commit 7f2c8bbd authored Dec 23, 2017 by Christoph Hellwig

swiotlb: rename swiotlb_free to swiotlb_exit



Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

parent 9ce9765a

arch/powerpc/kernel/dma-swiotlb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -121,7 +121,7 @@ static int __init check_swiotlb_enabled(void)
	if (ppc_swiotlb_enable)		if (ppc_swiotlb_enable)
	swiotlb_print_info();		swiotlb_print_info();
	else		else
	swiotlb_free();		swiotlb_exit();

	return 0;		return 0;
	}		}

arch/x86/kernel/pci-swiotlb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ void __init pci_swiotlb_late_init(void)
	{		{
	/* An IOMMU turned us off. */		/* An IOMMU turned us off. */
	if (!swiotlb)		if (!swiotlb)
	swiotlb_free();		swiotlb_exit();
	else {		else {
	printk(KERN_INFO "PCI-DMA: "		printk(KERN_INFO "PCI-DMA: "
	"Using software bounce buffering for IO (SWIOTLB)\n");		"Using software bounce buffering for IO (SWIOTLB)\n");

include/linux/swiotlb.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,10 +115,10 @@ extern int
	swiotlb_dma_supported(struct device *hwdev, u64 mask);		swiotlb_dma_supported(struct device *hwdev, u64 mask);

	#ifdef CONFIG_SWIOTLB		#ifdef CONFIG_SWIOTLB
	extern void __init swiotlb_free(void);		extern void __init swiotlb_exit(void);
	unsigned int swiotlb_max_segment(void);		unsigned int swiotlb_max_segment(void);
	#else		#else
	static inline void swiotlb_free(void) { }		static inline void swiotlb_exit(void) { }
	static inline unsigned int swiotlb_max_segment(void) { return 0; }		static inline unsigned int swiotlb_max_segment(void) { return 0; }
	#endif		#endif

lib/swiotlb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -417,7 +417,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
	return -ENOMEM;		return -ENOMEM;
	}		}

	void __init swiotlb_free(void)		void __init swiotlb_exit(void)
	{		{
	if (!io_tlb_orig_addr)		if (!io_tlb_orig_addr)
	return;		return;