make sba DMA mapping functions static
Now we don't need to export these DMA mapping functions. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
committed by
Ingo Molnar
parent
c7b3aee8af
commit
055bcf99a1
@@ -909,7 +909,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
dma_addr_t
|
static dma_addr_t
|
||||||
sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir,
|
sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir,
|
||||||
struct dma_attrs *attrs)
|
struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
@@ -991,7 +991,6 @@ sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir,
|
|||||||
#endif
|
#endif
|
||||||
return SBA_IOVA(ioc, iovp, offset);
|
return SBA_IOVA(ioc, iovp, offset);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sba_map_single_attrs);
|
|
||||||
|
|
||||||
#ifdef ENABLE_MARK_CLEAN
|
#ifdef ENABLE_MARK_CLEAN
|
||||||
static SBA_INLINE void
|
static SBA_INLINE void
|
||||||
@@ -1027,8 +1026,8 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size)
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
|
static void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
|
||||||
int dir, struct dma_attrs *attrs)
|
int dir, struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
struct ioc *ioc;
|
struct ioc *ioc;
|
||||||
#if DELAYED_RESOURCE_CNT > 0
|
#if DELAYED_RESOURCE_CNT > 0
|
||||||
@@ -1095,7 +1094,6 @@ void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
|
|||||||
spin_unlock_irqrestore(&ioc->res_lock, flags);
|
spin_unlock_irqrestore(&ioc->res_lock, flags);
|
||||||
#endif /* DELAYED_RESOURCE_CNT == 0 */
|
#endif /* DELAYED_RESOURCE_CNT == 0 */
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sba_unmap_single_attrs);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sba_alloc_coherent - allocate/map shared mem for DMA
|
* sba_alloc_coherent - allocate/map shared mem for DMA
|
||||||
@@ -1105,7 +1103,7 @@ EXPORT_SYMBOL(sba_unmap_single_attrs);
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
void *
|
static void *
|
||||||
sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)
|
sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)
|
||||||
{
|
{
|
||||||
struct ioc *ioc;
|
struct ioc *ioc;
|
||||||
@@ -1168,7 +1166,8 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle)
|
static void sba_free_coherent (struct device *dev, size_t size, void *vaddr,
|
||||||
|
dma_addr_t dma_handle)
|
||||||
{
|
{
|
||||||
sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);
|
sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);
|
||||||
free_pages((unsigned long) vaddr, get_order(size));
|
free_pages((unsigned long) vaddr, get_order(size));
|
||||||
@@ -1423,8 +1422,8 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents,
|
static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist,
|
||||||
int dir, struct dma_attrs *attrs)
|
int nents, int dir, struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
struct ioc *ioc;
|
struct ioc *ioc;
|
||||||
int coalesced, filled = 0;
|
int coalesced, filled = 0;
|
||||||
@@ -1503,7 +1502,6 @@ int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents,
|
|||||||
|
|
||||||
return filled;
|
return filled;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sba_map_sg_attrs);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sba_unmap_sg_attrs - unmap Scatter/Gather list
|
* sba_unmap_sg_attrs - unmap Scatter/Gather list
|
||||||
@@ -1515,8 +1513,8 @@ EXPORT_SYMBOL(sba_map_sg_attrs);
|
|||||||
*
|
*
|
||||||
* See Documentation/DMA-mapping.txt
|
* See Documentation/DMA-mapping.txt
|
||||||
*/
|
*/
|
||||||
void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
|
static void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
|
||||||
int nents, int dir, struct dma_attrs *attrs)
|
int nents, int dir, struct dma_attrs *attrs)
|
||||||
{
|
{
|
||||||
#ifdef ASSERT_PDIR_SANITY
|
#ifdef ASSERT_PDIR_SANITY
|
||||||
struct ioc *ioc;
|
struct ioc *ioc;
|
||||||
@@ -1552,7 +1550,6 @@ void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sba_unmap_sg_attrs);
|
|
||||||
|
|
||||||
/**************************************************************
|
/**************************************************************
|
||||||
*
|
*
|
||||||
@@ -2143,15 +2140,13 @@ nosbagart(char *str)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
static int sba_dma_supported (struct device *dev, u64 mask)
|
||||||
sba_dma_supported (struct device *dev, u64 mask)
|
|
||||||
{
|
{
|
||||||
/* make sure it's at least 32bit capable */
|
/* make sure it's at least 32bit capable */
|
||||||
return ((mask & 0xFFFFFFFFUL) == 0xFFFFFFFFUL);
|
return ((mask & 0xFFFFFFFFUL) == 0xFFFFFFFFUL);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
static int sba_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
||||||
sba_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -2181,11 +2176,6 @@ sba_page_override(char *str)
|
|||||||
|
|
||||||
__setup("sbapagesize=",sba_page_override);
|
__setup("sbapagesize=",sba_page_override);
|
||||||
|
|
||||||
EXPORT_SYMBOL(sba_dma_mapping_error);
|
|
||||||
EXPORT_SYMBOL(sba_dma_supported);
|
|
||||||
EXPORT_SYMBOL(sba_alloc_coherent);
|
|
||||||
EXPORT_SYMBOL(sba_free_coherent);
|
|
||||||
|
|
||||||
struct dma_mapping_ops sba_dma_ops = {
|
struct dma_mapping_ops sba_dma_ops = {
|
||||||
.alloc_coherent = sba_alloc_coherent,
|
.alloc_coherent = sba_alloc_coherent,
|
||||||
.free_coherent = sba_free_coherent,
|
.free_coherent = sba_free_coherent,
|
||||||
|
Reference in New Issue
Block a user