Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4788ba57 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: remove dmam_{declare,release}_coherent_memory 



These functions have never been used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d7076f07

Documentation/driver-model/devres.txt

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ DMA 
  dmaenginem_async_device_register()

  dmam_alloc_coherent()

  dmam_alloc_attrs()

  dmam_declare_coherent_memory()

  dmam_free_coherent()

  dmam_pool_create()

  dmam_pool_destroy()

include/linux/dma-mapping.h

+0 −19
Original line number Diff line number Diff line
@@ -691,25 +691,6 @@ static inline void dmam_free_coherent(struct device *dev, size_t size, 
				      void *vaddr, dma_addr_t dma_handle) { }

#endif /* !CONFIG_HAS_DMA */



#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT

extern int dmam_declare_coherent_memory(struct device *dev,

					phys_addr_t phys_addr,

					dma_addr_t device_addr, size_t size,

					int flags);

extern void dmam_release_declared_memory(struct device *dev);

#else /* CONFIG_HAVE_GENERIC_DMA_COHERENT */

static inline int dmam_declare_coherent_memory(struct device *dev,

				phys_addr_t phys_addr, dma_addr_t device_addr,

				size_t size, gfp_t gfp)

{

	return 0;

}



static inline void dmam_release_declared_memory(struct device *dev)

{

}

#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */



static inline void *dmam_alloc_coherent(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp)

{

kernel/dma/mapping.c

+0 −55
Original line number Diff line number Diff line
@@ -105,61 +105,6 @@ void *dmam_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, 
}

EXPORT_SYMBOL(dmam_alloc_attrs);



#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT



static void dmam_coherent_decl_release(struct device *dev, void *res)

{

	dma_release_declared_memory(dev);

}



/**

 * dmam_declare_coherent_memory - Managed dma_declare_coherent_memory()

 * @dev: Device to declare coherent memory for

 * @phys_addr: Physical address of coherent memory to be declared

 * @device_addr: Device address of coherent memory to be declared

 * @size: Size of coherent memory to be declared

 * @flags: Flags

 *

 * Managed dma_declare_coherent_memory().

 *

 * RETURNS:

 * 0 on success, -errno on failure.

 */

int dmam_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,

				 dma_addr_t device_addr, size_t size, int flags)

{

	void *res;

	int rc;



	res = devres_alloc(dmam_coherent_decl_release, 0, GFP_KERNEL);

	if (!res)

		return -ENOMEM;



	rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size,

					 flags);

	if (!rc)

		devres_add(dev, res);

	else

		devres_free(res);



	return rc;

}

EXPORT_SYMBOL(dmam_declare_coherent_memory);



/**

 * dmam_release_declared_memory - Managed dma_release_declared_memory().

 * @dev: Device to release declared coherent memory for

 *

 * Managed dmam_release_declared_memory().

 */

void dmam_release_declared_memory(struct device *dev)

{

	WARN_ON(devres_destroy(dev, dmam_coherent_decl_release, NULL, NULL));

}

EXPORT_SYMBOL(dmam_release_declared_memory);



#endif



/*

 * Create scatter-list for the already allocated DMA buffer.

 */