powerpc/pci: Rename pcibios_{add, remove}_pci_devices()

[cascardo/linux.git] / arch / powerpc / include / asm / pci-bridge.h

diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index f5056e3..99027b8 100644 (file)
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -17,33 +17,34 @@ struct device_node;
  * PCI controller operations
  */
 struct pci_controller_ops {
-       void            (*dma_dev_setup)(struct pci_dev *dev);
+       void            (*dma_dev_setup)(struct pci_dev *pdev);
        void            (*dma_bus_setup)(struct pci_bus *bus);
 
-       int             (*probe_mode)(struct pci_bus *);
+       int             (*probe_mode)(struct pci_bus *bus);
 
        /* Called when pci_enable_device() is called. Returns true to
         * allow assignment/enabling of the device. */
-       bool            (*enable_device_hook)(struct pci_dev *);
+       bool            (*enable_device_hook)(struct pci_dev *pdev);
 
-       void            (*disable_device)(struct pci_dev *);
+       void            (*disable_device)(struct pci_dev *pdev);
 
-       void            (*release_device)(struct pci_dev *);
+       void            (*release_device)(struct pci_dev *pdev);
 
        /* Called during PCI resource reassignment */
-       resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type);
-       void            (*reset_secondary_bus)(struct pci_dev *dev);
+       resource_size_t (*window_alignment)(struct pci_bus *bus,
+                                           unsigned long type);
+       void            (*reset_secondary_bus)(struct pci_dev *pdev);
 
 #ifdef CONFIG_PCI_MSI
-       int             (*setup_msi_irqs)(struct pci_dev *dev,
+       int             (*setup_msi_irqs)(struct pci_dev *pdev,
                                          int nvec, int type);
-       void            (*teardown_msi_irqs)(struct pci_dev *dev);
+       void            (*teardown_msi_irqs)(struct pci_dev *pdev);
 #endif
 
-       int             (*dma_set_mask)(struct pci_dev *dev, u64 dma_mask);
-       u64             (*dma_get_required_mask)(struct pci_dev *dev);
+       int             (*dma_set_mask)(struct pci_dev *pdev, u64 dma_mask);
+       u64             (*dma_get_required_mask)(struct pci_dev *pdev);
 
-       void            (*shutdown)(struct pci_controller *);
+       void            (*shutdown)(struct pci_controller *hose);
 };
 
 /*
@@ -208,14 +209,14 @@ struct pci_dn {
 #ifdef CONFIG_EEH
        struct eeh_dev *edev;           /* eeh device */
 #endif
-#define IODA_INVALID_PE                (-1)
+#define IODA_INVALID_PE                0xFFFFFFFF
 #ifdef CONFIG_PPC_POWERNV
-       int     pe_number;
+       unsigned int pe_number;
        int     vf_index;               /* VF index in the PF */
 #ifdef CONFIG_PCI_IOV
        u16     vfs_expanded;           /* number of VFs IOV BAR expanded */
        u16     num_vfs;                /* number of VFs enabled*/
-       int     *pe_num_map;            /* PE# for the first VF PE or array */
+       unsigned int *pe_num_map;       /* PE# for the first VF PE or array */
        bool    m64_single_mode;        /* Use M64 BAR in Single Mode */
 #define IODA_INVALID_M64        (-1)
        int     (*m64_map)[PCI_SRIOV_NUM_BARS];
@@ -259,10 +260,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn)
 extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn);
 
 /** Remove all of the PCI devices under this bus */
-extern void pcibios_remove_pci_devices(struct pci_bus *bus);
+extern void pci_hp_remove_devices(struct pci_bus *bus);
 
 /** Discover new pci devices under this bus, and add them */
-extern void pcibios_add_pci_devices(struct pci_bus *bus);
+extern void pci_hp_add_devices(struct pci_bus *bus);
 
 
 extern void isa_bridge_find_early(struct pci_controller *hose);