diff options
author | Jan Beulich <jbeulich@novell.com> | 2007-07-09 14:55:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-11 19:02:11 -0400 |
commit | caa5171622c8fef70fa20d2d74f4326866039df9 (patch) | |
tree | eee98d71a3d57db4fcadd6bcca2612b64c367083 /include/asm-sparc64 | |
parent | b7b095c154c50ee753832bbf78e8690c492fc8f6 (diff) |
PCI: remove pci_dac_dma_... APIs
Based on replies to a respective query, remove the pci_dac_dma_...() APIs
(except for pci_dac_dma_supported() on Alpha, where this function is used
in non-DAC PCI DMA code).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Jesse Barnes <jesse.barnes@intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Acked-by: David Miller <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/pci.h | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index 202915d82759..e11ac100f043 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h | |||
@@ -206,49 +206,6 @@ extern int pci_dma_supported(struct pci_dev *hwdev, u64 mask); | |||
206 | #define PCI64_REQUIRED_MASK (~(dma64_addr_t)0) | 206 | #define PCI64_REQUIRED_MASK (~(dma64_addr_t)0) |
207 | #define PCI64_ADDR_BASE 0xfffc000000000000UL | 207 | #define PCI64_ADDR_BASE 0xfffc000000000000UL |
208 | 208 | ||
209 | /* Usage of the pci_dac_foo interfaces is only valid if this | ||
210 | * test passes. | ||
211 | */ | ||
212 | #define pci_dac_dma_supported(pci_dev, mask) \ | ||
213 | ((((mask) & PCI64_REQUIRED_MASK) == PCI64_REQUIRED_MASK) ? 1 : 0) | ||
214 | |||
215 | static inline dma64_addr_t | ||
216 | pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page, unsigned long offset, int direction) | ||
217 | { | ||
218 | return (PCI64_ADDR_BASE + | ||
219 | __pa(page_address(page)) + offset); | ||
220 | } | ||
221 | |||
222 | static inline struct page * | ||
223 | pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr) | ||
224 | { | ||
225 | unsigned long paddr = (dma_addr & PAGE_MASK) - PCI64_ADDR_BASE; | ||
226 | |||
227 | return virt_to_page(__va(paddr)); | ||
228 | } | ||
229 | |||
230 | static inline unsigned long | ||
231 | pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr) | ||
232 | { | ||
233 | return (dma_addr & ~PAGE_MASK); | ||
234 | } | ||
235 | |||
236 | static inline void | ||
237 | pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len, int direction) | ||
238 | { | ||
239 | /* DAC cycle addressing does not make use of the | ||
240 | * PCI controller's streaming cache, so nothing to do. | ||
241 | */ | ||
242 | } | ||
243 | |||
244 | static inline void | ||
245 | pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len, int direction) | ||
246 | { | ||
247 | /* DAC cycle addressing does not make use of the | ||
248 | * PCI controller's streaming cache, so nothing to do. | ||
249 | */ | ||
250 | } | ||
251 | |||
252 | #define PCI_DMA_ERROR_CODE (~(dma_addr_t)0x0) | 209 | #define PCI_DMA_ERROR_CODE (~(dma_addr_t)0x0) |
253 | 210 | ||
254 | static inline int pci_dma_mapping_error(dma_addr_t dma_addr) | 211 | static inline int pci_dma_mapping_error(dma_addr_t dma_addr) |