Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1667488

[PATCH 01/11] dma-mapping: remove dmam_free_noncoherent

Show all headers | View raw

This function was never used since it was added.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

remove dma_alloc_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
  [PATCH 08/11] sgiseeq: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
  [PATCH 11/11] dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
  [PATCH 02/11] dma-mapping: replace dmam_alloc_noncoherent with dmam_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
  [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
    Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs Takashi Iwai <tiwai@suse.de> - 2017-06-16 11:00 +0200
      Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to   dma_alloc_attrs Takashi Iwai <tiwai@suse.de> - 2017-06-16 11:00 +0200
      Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to         dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 11:00 +0200
  [PATCH 10/11] i825xx: switch to switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:20 +0200
  [PATCH 05/11] serial/mpsc: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
  [PATCH 03/11] au1100fb: remove a bogus dma_free_nonconsistent call Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
    Re: [PATCH 03/11] au1100fb: remove a bogus dma_free_nonconsistent  call Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - 2017-06-19 13:20 +0200
  [PATCH 01/11] dma-mapping: remove dmam_free_noncoherent Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200
  [PATCH 06/11] sigwd93: switch to dma_alloc_attrs Christoph Hellwig <hch@lst.de> - 2017-06-16 09:30 +0200

csiph-web