powerpc/powernv: Rename alloc_m64_pe() to reserve_m64_pe()

The patch renames alloc_m64_pe() to reserve_m64_pe() to reflect
its real usage: We reserve PE numbers for M64 segments in advance
and then pick up the reserved PE numbers when building the mapping
between PE numbers and M64 segments.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 7aa040441c08..cf90cce3dc9f 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -172,7 +172,7 @@ fail:
         return -EIO;
 }
 
-static void pnv_ioda2_alloc_m64_pe(struct pnv_phb *phb)
+static void pnv_ioda2_reserve_m64_pe(struct pnv_phb *phb)
 {
         resource_size_t sgsz = phb->ioda.m64_segsize;
         struct pci_dev *pdev;
@@ -345,7 +345,7 @@ static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
         /* Use last M64 BAR to cover M64 window */
         phb->ioda.m64_bar_idx = 15;
         phb->init_m64 = pnv_ioda2_init_m64;
-        phb->alloc_m64_pe = pnv_ioda2_alloc_m64_pe;
+        phb->reserve_m64_pe = pnv_ioda2_reserve_m64_pe;
         phb->pick_m64_pe = pnv_ioda2_pick_m64_pe;
 }
 
@@ -837,8 +837,8 @@ static void pnv_pci_ioda_setup_PEs(void)
                 phb = hose->private_data;
 
                 /* M64 layout might affect PE allocation */
-                if (phb->alloc_m64_pe)
-                        phb->alloc_m64_pe(phb);
+                if (phb->reserve_m64_pe)
+                        phb->reserve_m64_pe(phb);
 
                 pnv_ioda_setup_PEs(hose->bus);
         }
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 34d29eb2a4de..6c02ff8dd69f 100644
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -130,7 +130,7 @@ struct pnv_phb {
         u32 (*bdfn_to_pe)(struct pnv_phb *phb, struct pci_bus *bus, u32 devfn);
         void (*shutdown)(struct pnv_phb *phb);
         int (*init_m64)(struct pnv_phb *phb);
-        void (*alloc_m64_pe)(struct pnv_phb *phb);
+        void (*reserve_m64_pe)(struct pnv_phb *phb);
         int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, int all);
         int (*get_pe_state)(struct pnv_phb *phb, int pe_no);
         void (*freeze_pe)(struct pnv_phb *phb, int pe_no);