[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-7.1 7/9] hw/ppc/spapr_nvdimm.c: use drc->index
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH for-7.1 7/9] hw/ppc/spapr_nvdimm.c: use drc->index |
Date: |
Fri, 18 Mar 2022 14:33:18 -0300 |
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_nvdimm.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c
index c4c97da5de..5acb761220 100644
--- a/hw/ppc/spapr_nvdimm.c
+++ b/hw/ppc/spapr_nvdimm.c
@@ -145,7 +145,6 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, void
*fdt,
int child_offset;
char *buf;
SpaprDrc *drc;
- uint32_t drc_idx;
uint32_t node = object_property_get_uint(OBJECT(nvdimm), PC_DIMM_NODE_PROP,
&error_abort);
uint64_t slot = object_property_get_uint(OBJECT(nvdimm), PC_DIMM_SLOT_PROP,
@@ -157,15 +156,13 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, void
*fdt,
drc = spapr_drc_by_id(TYPE_SPAPR_DRC_PMEM, slot);
g_assert(drc);
- drc_idx = spapr_drc_index(drc);
-
- buf = g_strdup_printf("ibm,pmemory@%x", drc_idx);
+ buf = g_strdup_printf("ibm,pmemory@%x", drc->index);
child_offset = fdt_add_subnode(fdt, parent_offset, buf);
g_free(buf);
_FDT(child_offset);
- _FDT((fdt_setprop_cell(fdt, child_offset, "reg", drc_idx)));
+ _FDT((fdt_setprop_cell(fdt, child_offset, "reg", drc->index)));
_FDT((fdt_setprop_string(fdt, child_offset, "compatible", "ibm,pmemory")));
_FDT((fdt_setprop_string(fdt, child_offset, "device_type",
"ibm,pmemory")));
@@ -175,7 +172,8 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, void
*fdt,
_FDT((fdt_setprop_string(fdt, child_offset, "ibm,unit-guid", buf)));
g_free(buf);
- _FDT((fdt_setprop_cell(fdt, child_offset, "ibm,my-drc-index", drc_idx)));
+ _FDT((fdt_setprop_cell(fdt, child_offset, "ibm,my-drc-index",
+ drc->index)));
_FDT((fdt_setprop_u64(fdt, child_offset, "ibm,block-size",
SPAPR_MINIMUM_SCM_BLOCK_SIZE)));
--
2.35.1
- [PATCH for-7.1 0/9] spapr: add drc->index, remove spapr_drc_index(), Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 1/9] hw/ppc/spapr_drc.c: add drc->index, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 2/9] hw/ppc/spapr_drc.c: redefine 'index' SpaprDRC property, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 3/9] hw/ppc/spapr_drc.c: use drc->index in trace functions, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 5/9] hw/ppc/spapr.c: use drc->index, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 4/9] hw/ppc/spapr_drc.c: use drc->index, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 6/9] hw/ppc/spapr_events.c: use drc->index, Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 9/9] hw/ppc/spapr_drc.c: remove spapr_drc_index(), Daniel Henrique Barboza, 2022/03/18
- [PATCH for-7.1 7/9] hw/ppc/spapr_nvdimm.c: use drc->index,
Daniel Henrique Barboza <=
- [PATCH for-7.1 8/9] hw/ppc/spapr_pci.c: use drc->index, Daniel Henrique Barboza, 2022/03/18
- Re: [PATCH for-7.1 0/9] spapr: add drc->index, remove spapr_drc_index(), David Gibson, 2022/03/20