PCI: remove pci_dac_dma_... APIs

[safe/jmp/linux-2.6] / include / asm-powerpc / pci.h

diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h
index ebf31f1..e16e7bc 100644 (file)
--- a/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
@@ -71,19 +71,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 #define PCI_DISABLE_MWI
 
 #ifdef CONFIG_PCI
-extern struct dma_mapping_ops *pci_dma_ops;
-
 extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);
-
-/* For DAC DMA, we currently don't support it by default, but
- * we let 64-bit platforms override this.
- */
-static inline int pci_dac_dma_supported(struct pci_dev *hwdev,u64 mask)
-{
-       if (pci_dma_ops && pci_dma_ops->dac_dma_supported)
-               return pci_dma_ops->dac_dma_supported(&hwdev->dev, mask);
-       return 0;
-}
+extern struct dma_mapping_ops *get_pci_dma_ops(void);
 
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                        enum pci_dma_burst_strategy *strat,
@@ -103,6 +92,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 }
 #else  /* CONFIG_PCI */
 #define set_pci_dma_ops(d)
+#define get_pci_dma_ops()      NULL
 #endif
 
 extern int pci_domain_nr(struct pci_bus *bus);
@@ -122,12 +112,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 }
 #endif
 
-/*
- * At present there are very few 32-bit PPC machines that can have
- * memory above the 4GB point, and we don't support that.
- */
-#define pci_dac_dma_supported(pci_dev, mask)   (0)
-
 /* Return the index of the PCI controller for device PDEV. */
 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 
@@ -241,8 +225,6 @@ extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);
 
 extern int pci_read_irq_line(struct pci_dev *dev);
 
-extern void pcibios_add_platform_entries(struct pci_dev *dev);
-
 struct file;
 extern pgprot_t        pci_phys_mem_access_prot(struct file *file,
                                         unsigned long pfn,