Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933894AbeALNjr (ORCPT + 1 other); Fri, 12 Jan 2018 08:39:47 -0500 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36493 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933508AbeALNjp (ORCPT ); Fri, 12 Jan 2018 08:39:45 -0500 X-Google-Smtp-Source: ACJfBouYXhE5BfvUBC2izv8g2+e6xD6r/deGN/OcgoKJaD+uRB3vymLNwfM4OZzrw2vZYmEgzandVw== Date: Fri, 12 Jan 2018 08:39:41 -0500 From: Konrad Rzeszutek Wilk To: Christoph Hellwig Cc: iommu@lists.linux-foundation.org, Michal Simek , Guan Xuetao , Christian =?iso-8859-1?Q?K=F6nig?= , linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 06/22] swiotlb: rename swiotlb_free to swiotlb_exit Message-ID: <20180112133939.GF26900@localhost.localdomain> References: <20180110080932.14157-1-hch@lst.de> <20180110080932.14157-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180110080932.14157-7-hch@lst.de> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Wed, Jan 10, 2018 at 09:09:16AM +0100, Christoph Hellwig wrote: OK? Reviewed-by: Konrad Rzeszutek Wilk > Signed-off-by: Christoph Hellwig > --- > arch/powerpc/kernel/dma-swiotlb.c | 2 +- > arch/x86/kernel/pci-swiotlb.c | 2 +- > include/linux/swiotlb.h | 4 ++-- > lib/swiotlb.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c > index 506ac4fafac5..88f3963ca30f 100644 > --- a/arch/powerpc/kernel/dma-swiotlb.c > +++ b/arch/powerpc/kernel/dma-swiotlb.c > @@ -121,7 +121,7 @@ static int __init check_swiotlb_enabled(void) > if (ppc_swiotlb_enable) > swiotlb_print_info(); > else > - swiotlb_free(); > + swiotlb_exit(); > > return 0; > } > diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c > index 0d77603c2f50..0ee0f8f34251 100644 > --- a/arch/x86/kernel/pci-swiotlb.c > +++ b/arch/x86/kernel/pci-swiotlb.c > @@ -120,7 +120,7 @@ void __init pci_swiotlb_late_init(void) > { > /* An IOMMU turned us off. */ > if (!swiotlb) > - swiotlb_free(); > + swiotlb_exit(); > else { > printk(KERN_INFO "PCI-DMA: " > "Using software bounce buffering for IO (SWIOTLB)\n"); > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h > index 24ed817082ee..606375e35d87 100644 > --- a/include/linux/swiotlb.h > +++ b/include/linux/swiotlb.h > @@ -115,10 +115,10 @@ extern int > swiotlb_dma_supported(struct device *hwdev, u64 mask); > > #ifdef CONFIG_SWIOTLB > -extern void __init swiotlb_free(void); > +extern void __init swiotlb_exit(void); > unsigned int swiotlb_max_segment(void); > #else > -static inline void swiotlb_free(void) { } > +static inline void swiotlb_exit(void) { } > static inline unsigned int swiotlb_max_segment(void) { return 0; } > #endif > > diff --git a/lib/swiotlb.c b/lib/swiotlb.c > index 125c1062119f..cf5311908fa9 100644 > --- a/lib/swiotlb.c > +++ b/lib/swiotlb.c > @@ -417,7 +417,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) > return -ENOMEM; > } > > -void __init swiotlb_free(void) > +void __init swiotlb_exit(void) > { > if (!io_tlb_orig_addr) > return; > -- > 2.14.2 >