From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: Re: [PATCH 01/11] dma-mapping: remove dmam_free_noncoherent Date: Mon, 26 Jun 2017 00:07:15 -0700 Message-ID: <20170626070715.GA12711@infradead.org> References: <20170616071716.17321-1-hch@lst.de> <20170616071716.17321-2-hch@lst.de> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4LKtBt1o2RINsbMJrn+A9ue12UfyB4oeZ0D6MYWESig=; b=f1ld+MvhbOu553X4LX8v92OAG lTEdLZ+fSLcIaEcste2Da6Ll0Yhk72b4CmZpINhhN0z8O9R/H7nhNIU8PVjmcholaiHUzcZ23u7UA mXj+tFZ3sKmHEB6HO97ZAGZ5ehiRbCzcSMJ1Q8Q8uD/PddLXisS4Hqx3I7DOvKkJD924zgIGBOQ3e u+SIGY49bmHhDdEZ+H6Exmc5BF6Oe5MJIxZ1Po9Y1BPcsDWNSZDwu/53RLbEBJRYWEzEsRVfgjJ8K G4/WQFyOYAavRlaFWwP8sgFlnq4RJAhwaI3vAgMQH4B8hJuKj5Su44+j1UtPQM/mvbG95agEYl1cN Content-Disposition: inline In-Reply-To: <20170616071716.17321-2-hch@lst.de> Sender: linux-scsi-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christoph Hellwig Cc: linux-scsi@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org, linux-metag@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Tejun Heo Tejun, does this look ok to you? On Fri, Jun 16, 2017 at 09:17:06AM +0200, Christoph Hellwig wrote: > This function was never used since it was added. > > Signed-off-by: Christoph Hellwig > --- > Documentation/driver-model/devres.txt | 1 - > drivers/base/dma-mapping.c | 20 -------------------- > include/linux/dma-mapping.h | 2 -- > 3 files changed, 23 deletions(-) > > diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt > index e72587fe477d..9070ff06b558 100644 > --- a/Documentation/driver-model/devres.txt > +++ b/Documentation/driver-model/devres.txt > @@ -243,7 +243,6 @@ DMA > dmam_alloc_noncoherent() > dmam_declare_coherent_memory() > dmam_free_coherent() > - dmam_free_noncoherent() > dmam_pool_create() > dmam_pool_destroy() > > diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c > index f3deb6af42ad..5940c9dace36 100644 > --- a/drivers/base/dma-mapping.c > +++ b/drivers/base/dma-mapping.c > @@ -148,26 +148,6 @@ void *dmam_alloc_noncoherent(struct device *dev, size_t size, > } > EXPORT_SYMBOL(dmam_alloc_noncoherent); > > -/** > - * dmam_free_coherent - Managed dma_free_noncoherent() > - * @dev: Device to free noncoherent memory for > - * @size: Size of allocation > - * @vaddr: Virtual address of the memory to free > - * @dma_handle: DMA handle of the memory to free > - * > - * Managed dma_free_noncoherent(). > - */ > -void dmam_free_noncoherent(struct device *dev, size_t size, void *vaddr, > - dma_addr_t dma_handle) > -{ > - struct dma_devres match_data = { size, vaddr, dma_handle }; > - > - dma_free_noncoherent(dev, size, vaddr, dma_handle); > - WARN_ON(!devres_destroy(dev, dmam_noncoherent_release, dmam_match, > - &match_data)); > -} > -EXPORT_SYMBOL(dmam_free_noncoherent); > - > #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT > > static void dmam_coherent_decl_release(struct device *dev, void *res) > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index 4f3eecedca2d..830ec5f06a4f 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -749,8 +749,6 @@ extern void dmam_free_coherent(struct device *dev, size_t size, void *vaddr, > dma_addr_t dma_handle); > extern void *dmam_alloc_noncoherent(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t gfp); > -extern void dmam_free_noncoherent(struct device *dev, size_t size, void *vaddr, > - dma_addr_t dma_handle); > #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT > extern int dmam_declare_coherent_memory(struct device *dev, > phys_addr_t phys_addr, > -- > 2.11.0 > ---end quoted text---