Patchwork pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt

login
register
mail settings
Submitter Alexey Kardashevskiy
Date June 14, 2012, 4:40 a.m.
Message ID <4FD96B26.70305@ozlabs.ru>
Download mbox | patch
Permalink /patch/164806/
State New
Headers show

Comments

Alexey Kardashevskiy - June 14, 2012, 4:40 a.m.
spapr_populate_pci_devices() populates the device tree only with bus
properties and has nothing to do with the devices on it as PCI BAR
allocation is done by the system firmware (SLOF).

New name - spapr_populate_pci_dt() - describes the functionality better.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 hw/spapr.c     |    2 +-
 hw/spapr_pci.c |    6 +++---
 hw/spapr_pci.h |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
Alexander Graf - June 28, 2012, 1:15 p.m.
On 06/14/2012 06:40 AM, Alexey Kardashevskiy wrote:
> spapr_populate_pci_devices() populates the device tree only with bus
> properties and has nothing to do with the devices on it as PCI BAR
> allocation is done by the system firmware (SLOF).
>
> New name - spapr_populate_pci_dt() - describes the functionality better.
>
> Signed-off-by: Alexey Kardashevskiy<aik@ozlabs.ru>

Thanks, applied to ppc-next.



Alex

Patch

diff --git a/hw/spapr.c b/hw/spapr.c
index 47b26ee..2e0b4b8 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -551,7 +551,7 @@  static void spapr_finalize_fdt(sPAPREnvironment *spapr,
     }

     QLIST_FOREACH(phb, &spapr->phbs, list) {
-        ret = spapr_populate_pci_devices(phb, PHANDLE_XICP, fdt);
+        ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);
     }

     if (ret < 0) {
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 1c0b605..269dbbf 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -345,9 +345,9 @@  void spapr_create_phb(sPAPREnvironment *spapr,
 #define b_fff(x)        b_x((x), 8, 3)  /* function number */
 #define b_rrrrrrrr(x)   b_x((x), 0, 8)  /* register number */

-int spapr_populate_pci_devices(sPAPRPHBState *phb,
-                               uint32_t xics_phandle,
-                               void *fdt)
+int spapr_populate_pci_dt(sPAPRPHBState *phb,
+                          uint32_t xics_phandle,
+                          void *fdt)
 {
     int bus_off, i, j;
     char nodename[256];
diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
index a141764..dd66f4b 100644
--- a/hw/spapr_pci.h
+++ b/hw/spapr_pci.h
@@ -55,8 +55,8 @@  void spapr_create_phb(sPAPREnvironment *spapr,
                       uint64_t mem_win_addr, uint64_t mem_win_size,
                       uint64_t io_win_addr);

-int spapr_populate_pci_devices(sPAPRPHBState *phb,
-                               uint32_t xics_phandle,
-                               void *fdt);
+int spapr_populate_pci_dt(sPAPRPHBState *phb,
+                          uint32_t xics_phandle,
+                          void *fdt);

 #endif /* __HW_SPAPR_PCI_H__ */