| Message ID | 20200106182425.20312-2-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | trivial unneeded labels cleanup | expand |
On Mon, Jan 06, 2020 at 03:23:27PM -0300, Daniel Henrique Barboza wrote: > 'out' can be replaced by 'return' with the appropriate > return value. > > CC: David Gibson <david@gibson.dropbear.id.au> > CC: qemu-ppc@nongnu.org > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Applied to ppc-for-5.0. I see this is part of a larged series which might have a different merge plan, but it should be an easy conflict to resolve if that happens. > --- > hw/ppc/spapr.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f11422fc41..1bfe47337c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -878,7 +878,7 @@ static int spapr_dt_cas_updates(SpaprMachineState *spapr, void *fdt, > g_assert(smc->dr_lmb_enabled); > ret = spapr_populate_drconf_memory(spapr, fdt); > if (ret) { > - goto out; > + return ret; > } > } > > @@ -889,11 +889,8 @@ static int spapr_dt_cas_updates(SpaprMachineState *spapr, void *fdt, > return offset; > } > } > - ret = spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas, > - "ibm,architecture-vec-5"); > - > -out: > - return ret; > + return spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas, > + "ibm,architecture-vec-5"); > } > > static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f11422fc41..1bfe47337c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -878,7 +878,7 @@ static int spapr_dt_cas_updates(SpaprMachineState *spapr, void *fdt, g_assert(smc->dr_lmb_enabled); ret = spapr_populate_drconf_memory(spapr, fdt); if (ret) { - goto out; + return ret; } } @@ -889,11 +889,8 @@ static int spapr_dt_cas_updates(SpaprMachineState *spapr, void *fdt, return offset; } } - ret = spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas, - "ibm,architecture-vec-5"); - -out: - return ret; + return spapr_ovec_populate_dt(fdt, offset, spapr->ov5_cas, + "ibm,architecture-vec-5"); } static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)
'out' can be replaced by 'return' with the appropriate return value. CC: David Gibson <david@gibson.dropbear.id.au> CC: qemu-ppc@nongnu.org Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/ppc/spapr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)