powerpc: Remove shims for pci_controller_ops operations

[deliverable/linux.git] / arch / powerpc / include / asm / machdep.h

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index e29f058c0903122cfce9b8c9dd4925c24fab6467..5c19ac527a8edf71aaf3d1904538c8b62291e794 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -103,9 +103,6 @@ struct machdep_calls {
 #endif
 #endif /* CONFIG_PPC64 */
 
-       void            (*pci_dma_dev_setup)(struct pci_dev *dev);
-       void            (*pci_dma_bus_setup)(struct pci_bus *bus);
-
        /* Platform set_dma_mask and dma_get_required_mask overrides */
        int             (*dma_set_mask)(struct device *dev, u64 dma_mask);
        u64             (*dma_get_required_mask)(struct device *dev);
@@ -127,7 +124,6 @@ struct machdep_calls {
        /* PCI stuff */
        /* Called after allocating resources */
        void            (*pcibios_fixup)(void);
-       int             (*pci_probe_mode)(struct pci_bus *);
        void            (*pci_irq_fixup)(struct pci_dev *dev);
        int             (*pcibios_root_bridge_prepare)(struct pci_host_bridge
                                *bridge);
@@ -237,19 +233,9 @@ struct machdep_calls {
        /* Called for each PCI bus in the system when it's probed */
        void (*pcibios_fixup_bus)(struct pci_bus *);
 
-       /* Called when pci_enable_device() is called. Returns true to
-        * allow assignment/enabling of the device. */
-       bool (*pcibios_enable_device_hook)(struct pci_dev *);
-
        /* Called after scan and before resource survey */
        void (*pcibios_fixup_phb)(struct pci_controller *hose);
 
-       /* Called during PCI resource reassignment */
-       resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
-
-       /* Reset the secondary bus of bridge */
-       void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
-
        /* Called to shutdown machine specific hardware not already controlled
         * by other drivers.
         */