[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_devi
From: |
David Gibson |
Subject: |
Re: [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree() |
Date: |
Tue, 7 Jan 2020 10:45:17 +1100 |
On Mon, Jan 06, 2020 at 03:23:28PM -0300, Daniel Henrique Barboza wrote:
> 'out' label can be replaced by 'return -1' in all cases.
>
> CC: David Gibson <address@hidden>
> CC: address@hidden
> Signed-off-by: Daniel Henrique Barboza <address@hidden>
Applied to ppc-for-5.0.
> ---
> hw/ppc/ppc440_bamboo.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 4d95c0f8a8..b782641b23 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -71,12 +71,12 @@ static int bamboo_load_device_tree(hwaddr addr,
>
> filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
> if (!filename) {
> - goto out;
> + return -1;
> }
> fdt = load_device_tree(filename, &fdt_size);
> g_free(filename);
> if (fdt == NULL) {
> - goto out;
> + return -1;
> }
>
> /* Manipulate device tree in memory. */
> @@ -117,10 +117,6 @@ static int bamboo_load_device_tree(hwaddr addr,
> rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
> g_free(fdt);
> return 0;
> -
> -out:
> -
> - return ret;
> }
>
> /* Create reset TLB entries for BookE, spanning the 32bit addr space. */
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [PATCH v1 00/59] trivial unneeded labels cleanup, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 01/59] spapr.c: remove 'out' label in spapr_dt_cas_updates(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree(), Daniel Henrique Barboza, 2020/01/06
- Re: [PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree(),
David Gibson <=
- [PATCH v1 04/59] paaudio.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 03/59] kvm-all.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 05/59] ram.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 07/59] unicore32/softmmu.c: remove 'do_fault' label in get_phys_addr_ucv2(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 06/59] mips-semi.c: remove 'uhi_done' label in helper_do_semihosting(), Daniel Henrique Barboza, 2020/01/06