powerpc/powernv/ioda: Reduce a number of hooks in pnv_phb

fixup_phb() is never used, this removes it.

pick_m64_pe() and reserve_m64_pe() are always defined for all powernv
PHBs: they are initialized by pnv_ioda_parse_m64_window() which is
called unconditionally from pnv_pci_init_ioda_phb() which initializes
all known PHB types on powernv so we can open code them.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index f5ffffb4094df1aae7bf60595dcde08ea72faf26..3d2d8fa1f87b027e33f30b5e41e60ff23a67727c 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -517,8 +517,6 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
                phb->init_m64 = pnv_ioda1_init_m64;
        else
                phb->init_m64 = pnv_ioda2_init_m64;
-       phb->reserve_m64_pe = pnv_ioda_reserve_m64_pe;
-       phb->pick_m64_pe = pnv_ioda_pick_m64_pe;
 }
 
 static void pnv_ioda_freeze_pe(struct pnv_phb *phb, int pe_no)
@@ -1160,8 +1158,8 @@ static struct pnv_ioda_pe *pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)
                pe = &phb->ioda.pe_array[phb->ioda.root_pe_idx];
 
        /* Check if PE is determined by M64 */
-       if (!pe && phb->pick_m64_pe)
-               pe = phb->pick_m64_pe(bus, all);
+       if (!pe)
+               pe = pnv_ioda_pick_m64_pe(bus, all);
 
        /* The PE number isn't pinned by M64 */
        if (!pe)
@@ -3394,8 +3392,7 @@ static void pnv_pci_setup_bridge(struct pci_bus *bus, unsigned long type)
                return;
 
        /* Reserve PEs according to used M64 resources */
-       if (phb->reserve_m64_pe)
-               phb->reserve_m64_pe(bus, NULL, all);
+       pnv_ioda_reserve_m64_pe(bus, NULL, all);
 
        /*
         * Assign PE. We might run here because of partial hotplug.

diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 8b37b28e383181bfd7fb8a0b24e44983d17efc81..213137398bc0b97d24b9c09a87c432f4d7b8f741 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -115,11 +115,7 @@ struct pnv_phb {
                         unsigned int hwirq, unsigned int virq,
                         unsigned int is_64, struct msi_msg *msg);
        void (*dma_dev_setup)(struct pnv_phb *phb, struct pci_dev *pdev);
-       void (*fixup_phb)(struct pci_controller *hose);
        int (*init_m64)(struct pnv_phb *phb);
-       void (*reserve_m64_pe)(struct pci_bus *bus,
-                              unsigned long *pe_bitmap, bool all);
-       struct pnv_ioda_pe *(*pick_m64_pe)(struct pci_bus *bus, bool all);
        int (*get_pe_state)(struct pnv_phb *phb, int pe_no);
        void (*freeze_pe)(struct pnv_phb *phb, int pe_no);
        int (*unfreeze_pe)(struct pnv_phb *phb, int pe_no, int opt);