mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-11 03:24:58 -06:00
hw/nvram: Simplify memory_region_init_rom_device() calls
Mechanical change using the following coccinelle script: @@ expression mr, owner, arg3, arg4, arg5, arg6, errp; @@ - memory_region_init_rom_device(mr, owner, arg3, arg4, arg5, arg6, &errp); if ( - errp + !memory_region_init_rom_device(mr, owner, arg3, arg4, arg5, arg6, &errp) ) { ... return; } and removing the local Error variable. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Reviewed-by: Gavin Shan <gshan@redhat.com> Message-Id: <20231120213301.24349-25-philmd@linaro.org>
This commit is contained in:
parent
7493bd184e
commit
ca1b876292
1 changed files with 2 additions and 5 deletions
|
@ -336,12 +336,9 @@ static void nrf51_nvm_init(Object *obj)
|
||||||
static void nrf51_nvm_realize(DeviceState *dev, Error **errp)
|
static void nrf51_nvm_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
NRF51NVMState *s = NRF51_NVM(dev);
|
NRF51NVMState *s = NRF51_NVM(dev);
|
||||||
Error *err = NULL;
|
|
||||||
|
|
||||||
memory_region_init_rom_device(&s->flash, OBJECT(dev), &flash_ops, s,
|
if (!memory_region_init_rom_device(&s->flash, OBJECT(dev), &flash_ops, s,
|
||||||
"nrf51_soc.flash", s->flash_size, &err);
|
"nrf51_soc.flash", s->flash_size, errp)) {
|
||||||
if (err) {
|
|
||||||
error_propagate(errp, err);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue