Skip to content

L
linux
Commit cdc28d59 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files
Options

make sn DMA mapping functions static 

Now we don't need to export sn DMA mapping functions.
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fad6a029
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 38 deletions
arch/ia64/sn/pci/pci_dma.c
View file @ cdc28d59
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* this function. Of course, SN only supports devices that have 32 or more * this function. Of course, SN only supports devices that have 32 or more
* address bits when using the PMU. * address bits when using the PMU.
*/ */
int sn_dma_supported(struct device *dev, u64 mask) static int sn_dma_supported(struct device *dev, u64 mask)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type);
...@@ -40,7 +40,6 @@ int sn_dma_supported(struct device *dev, u64 mask) ...@@ -40,7 +40,6 @@ int sn_dma_supported(struct device *dev, u64 mask)
return 0; return 0;
return 1; return 1;
} }
EXPORT_SYMBOL(sn_dma_supported);
/** /**
* sn_dma_set_mask - set the DMA mask * sn_dma_set_mask - set the DMA mask
...@@ -76,8 +75,8 @@ EXPORT_SYMBOL(sn_dma_set_mask); ...@@ -76,8 +75,8 @@ EXPORT_SYMBOL(sn_dma_set_mask);
* queue for a SCSI controller). See Documentation/DMA-API.txt for * queue for a SCSI controller). See Documentation/DMA-API.txt for
* more information. * more information.
*/ */
void *sn_dma_alloc_coherent(struct device *dev, size_t size, static void *sn_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t * dma_handle, gfp_t flags) dma_addr_t * dma_handle, gfp_t flags)
{ {
void *cpuaddr; void *cpuaddr;
unsigned long phys_addr; unsigned long phys_addr;
...@@ -125,7 +124,6 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size, ...@@ -125,7 +124,6 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size,
return cpuaddr; return cpuaddr;
} }
EXPORT_SYMBOL(sn_dma_alloc_coherent);
/** /**
* sn_pci_free_coherent - free memory associated with coherent DMAable region * sn_pci_free_coherent - free memory associated with coherent DMAable region
...@@ -137,8 +135,8 @@ EXPORT_SYMBOL(sn_dma_alloc_coherent); ...@@ -137,8 +135,8 @@ EXPORT_SYMBOL(sn_dma_alloc_coherent);
* Frees the memory allocated by dma_alloc_coherent(), potentially unmapping * Frees the memory allocated by dma_alloc_coherent(), potentially unmapping
* any associated IOMMU mappings. * any associated IOMMU mappings.
*/ */
void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
dma_addr_t dma_handle) dma_addr_t dma_handle)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev); struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
...@@ -148,7 +146,6 @@ void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, ...@@ -148,7 +146,6 @@ void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
provider->dma_unmap(pdev, dma_handle, 0); provider->dma_unmap(pdev, dma_handle, 0);
free_pages((unsigned long)cpu_addr, get_order(size)); free_pages((unsigned long)cpu_addr, get_order(size));
} }
EXPORT_SYMBOL(sn_dma_free_coherent);
/** /**
* sn_dma_map_single_attrs - map a single page for DMA * sn_dma_map_single_attrs - map a single page for DMA
...@@ -174,9 +171,9 @@ EXPORT_SYMBOL(sn_dma_free_coherent); ...@@ -174,9 +171,9 @@ EXPORT_SYMBOL(sn_dma_free_coherent);
* TODO: simplify our interface; * TODO: simplify our interface;
* figure out how to save dmamap handle so can use two step. * figure out how to save dmamap handle so can use two step.
*/ */
dma_addr_t sn_dma_map_single_attrs(struct device *dev, void *cpu_addr, static dma_addr_t sn_dma_map_single_attrs(struct device *dev, void *cpu_addr,
size_t size, int direction, size_t size, int direction,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
dma_addr_t dma_addr; dma_addr_t dma_addr;
unsigned long phys_addr; unsigned long phys_addr;
...@@ -202,7 +199,6 @@ dma_addr_t sn_dma_map_single_attrs(struct device *dev, void *cpu_addr, ...@@ -202,7 +199,6 @@ dma_addr_t sn_dma_map_single_attrs(struct device *dev, void *cpu_addr,
} }
return dma_addr; return dma_addr;
} }
EXPORT_SYMBOL(sn_dma_map_single_attrs);
/** /**
* sn_dma_unmap_single_attrs - unamp a DMA mapped page * sn_dma_unmap_single_attrs - unamp a DMA mapped page
...@@ -216,9 +212,9 @@ EXPORT_SYMBOL(sn_dma_map_single_attrs); ...@@ -216,9 +212,9 @@ EXPORT_SYMBOL(sn_dma_map_single_attrs);
* by @dma_handle into the coherence domain. On SN, we're always cache * by @dma_handle into the coherence domain. On SN, we're always cache
* coherent, so we just need to free any ATEs associated with this mapping. * coherent, so we just need to free any ATEs associated with this mapping.
*/ */
void sn_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr, static void sn_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr,
size_t size, int direction, size_t size, int direction,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev); struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
...@@ -227,7 +223,6 @@ void sn_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr, ...@@ -227,7 +223,6 @@ void sn_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr,
provider->dma_unmap(pdev, dma_addr, direction); provider->dma_unmap(pdev, dma_addr, direction);
} }
EXPORT_SYMBOL(sn_dma_unmap_single_attrs);
/** /**
* sn_dma_unmap_sg_attrs - unmap a DMA scatterlist * sn_dma_unmap_sg_attrs - unmap a DMA scatterlist
...@@ -239,9 +234,9 @@ EXPORT_SYMBOL(sn_dma_unmap_single_attrs); ...@@ -239,9 +234,9 @@ EXPORT_SYMBOL(sn_dma_unmap_single_attrs);
* *
* Unmap a set of streaming mode DMA translations. * Unmap a set of streaming mode DMA translations.
*/ */
void sn_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, static void sn_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,
int nhwentries, int direction, int nhwentries, int direction,
struct dma_attrs *attrs) struct dma_attrs *attrs)
{ {
int i; int i;
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
...@@ -256,7 +251,6 @@ void sn_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, ...@@ -256,7 +251,6 @@ void sn_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,
sg->dma_length = 0; sg->dma_length = 0;
} }
} }
EXPORT_SYMBOL(sn_dma_unmap_sg_attrs);
/** /**
* sn_dma_map_sg_attrs - map a scatterlist for DMA * sn_dma_map_sg_attrs - map a scatterlist for DMA
...@@ -273,8 +267,8 @@ EXPORT_SYMBOL(sn_dma_unmap_sg_attrs); ...@@ -273,8 +267,8 @@ EXPORT_SYMBOL(sn_dma_unmap_sg_attrs);
* *
* Maps each entry of @sg for DMA. * Maps each entry of @sg for DMA.
*/ */
int sn_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, static int sn_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl,
int nhwentries, int direction, struct dma_attrs *attrs) int nhwentries, int direction, struct dma_attrs *attrs)
{ {
unsigned long phys_addr; unsigned long phys_addr;
struct scatterlist *saved_sg = sgl, *sg; struct scatterlist *saved_sg = sgl, *sg;
...@@ -321,41 +315,35 @@ int sn_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, ...@@ -321,41 +315,35 @@ int sn_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl,
return nhwentries; return nhwentries;
} }
EXPORT_SYMBOL(sn_dma_map_sg_attrs);
void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, static void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type);
} }
EXPORT_SYMBOL(sn_dma_sync_single_for_cpu);
void sn_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, static void sn_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type);
} }
EXPORT_SYMBOL(sn_dma_sync_single_for_device);
void sn_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, static void sn_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type);
} }
EXPORT_SYMBOL(sn_dma_sync_sg_for_cpu);
void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, static void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type);
} }
EXPORT_SYMBOL(sn_dma_sync_sg_for_device);
int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{ {
return 0; return 0;
} }
EXPORT_SYMBOL(sn_dma_mapping_error);
char *sn_pci_get_legacy_mem(struct pci_bus *bus) char *sn_pci_get_legacy_mem(struct pci_bus *bus)
{ {
...@@ -467,7 +455,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size) ...@@ -467,7 +455,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
return ret; return ret;
} }
struct dma_mapping_ops sn_dma_ops = { static struct dma_mapping_ops sn_dma_ops = {
.alloc_coherent = sn_dma_alloc_coherent, .alloc_coherent = sn_dma_alloc_coherent,
.free_coherent = sn_dma_free_coherent, .free_coherent = sn_dma_free_coherent,
.map_single_attrs = sn_dma_map_single_attrs, .map_single_attrs = sn_dma_map_single_attrs,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7