mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp

Browse Source 
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>
Message-Id: <20200622094227.1271650-15-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-22 11:42:25 +02:00
parent 934df91296
commit c20b4ccce0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/arm/aspeed.c
View File

@ -215,8 +215,8 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size,
g_free(storage); g_free(storage);
} }
static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, static void aspeed_board_init_flashes(AspeedSMCState *s,
Error **errp) const char *flashtype)
{ {
int i ; int i ;
@ -227,8 +227,8 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
fl->flash = qdev_new(flashtype); fl->flash = qdev_new(flashtype);
if (dinfo) { if (dinfo) {
qdev_prop_set_drive_err(fl->flash, "drive", qdev_prop_set_drive(fl->flash, "drive",
blk_by_legacy_dinfo(dinfo), errp); blk_by_legacy_dinfo(dinfo));
} }
qdev_realize_and_unref(fl->flash, BUS(s->spi), &error_fatal); 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); "max_ram", max_ram_size - ram_size);
memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram); 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.fmc, amc->fmc_model);
aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model, &error_abort); aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model);
/* Install first FMC flash content as a boot rom. */ /* Install first FMC flash content as a boot rom. */
if (drive0) { if (drive0) {