[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter
From: |
Markus Armbruster |
Subject: |
[PATCH v2 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp |
Date: |
Mon, 22 Jun 2020 11:42:25 +0200 |
We always pass &error_abort. Drop the parameter, use &error_abort
directly.
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/arm/aspeed.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 42d818b81c..863757e1f0 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -215,8 +215,8 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr,
size_t rom_size,
g_free(storage);
}
-static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
- Error **errp)
+static void aspeed_board_init_flashes(AspeedSMCState *s,
+ const char *flashtype)
{
int i ;
@@ -227,8 +227,8 @@ static void aspeed_board_init_flashes(AspeedSMCState *s,
const char *flashtype,
fl->flash = qdev_new(flashtype);
if (dinfo) {
- qdev_prop_set_drive_err(fl->flash, "drive",
- blk_by_legacy_dinfo(dinfo), errp);
+ qdev_prop_set_drive(fl->flash, "drive",
+ blk_by_legacy_dinfo(dinfo));
}
qdev_realize_and_unref(fl->flash, BUS(s->spi), &error_fatal);
@@ -314,8 +314,8 @@ static void aspeed_machine_init(MachineState *machine)
"max_ram", max_ram_size - ram_size);
memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram);
- aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model, &error_abort);
- aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model, &error_abort);
+ aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model);
+ aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model);
/* Install first FMC flash content as a boot rom. */
if (drive0) {
--
2.26.2
- [PATCH v2 02/16] iotests/172: Cover empty filename and multiple use of drives, (continued)
- [PATCH v2 02/16] iotests/172: Cover empty filename and multiple use of drives, Markus Armbruster, 2020/06/22
- [PATCH v2 03/16] iotests/172: Cover -global floppy.drive=..., Markus Armbruster, 2020/06/22
- [PATCH v2 05/16] fdc: Open-code fdctrl_init_isa(), Markus Armbruster, 2020/06/22
- [PATCH v2 10/16] qdev: Improve netdev property override error a bit, Markus Armbruster, 2020/06/22
- [PATCH v2 01/16] iotests/172: Include "info block" in test output, Markus Armbruster, 2020/06/22
- [PATCH v2 08/16] blockdev: Deprecate -drive with bogus interface type, Markus Armbruster, 2020/06/22
- [PATCH v2 09/16] qdev: Eliminate get_pointer(), set_pointer(), Markus Armbruster, 2020/06/22
- [PATCH v2 06/16] fdc: Deprecate configuring floppies with -global isa-fdc, Markus Armbruster, 2020/06/22
- [PATCH v2 04/16] fdc: Reject clash between -drive if=floppy and -global isa-fdc, Markus Armbruster, 2020/06/22
- [PATCH v2 13/16] qdev: Make qdev_prop_set_drive() match the other helpers, Markus Armbruster, 2020/06/22
- [PATCH v2 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp,
Markus Armbruster <=
- [PATCH v2 15/16] sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error, Markus Armbruster, 2020/06/22
- [PATCH v2 16/16] sd/milkymist-memcard: Fix error API violation, Markus Armbruster, 2020/06/22
- [PATCH v2 11/16] qdev: Reject drive property override, Markus Armbruster, 2020/06/22
- [PATCH v2 12/16] qdev: Reject chardev property override, Markus Armbruster, 2020/06/22
- Re: [PATCH v2 00/16] Crazy shit around -global (pardon my french), no-reply, 2020/06/22
- Re: [PATCH v2 00/16] Crazy shit around -global (pardon my french), John Snow, 2020/06/24