Re: [PATCH-for-9.0 24/25] hw/nvram: Simplify memory_region_init_rom_device() calls

[Gavin Shan]

On 11/21/23 07:32, Philippe Mathieu-Daudé wrote:

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, );
 if (
-   errp
+   !memory_region_init_rom_device(mr, owner, arg3, arg4, arg5, arg6, )
 ) {
 ...
 return;
 }

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé 
---
  hw/nvram/nrf51_nvm.c | 7 ++-
  1 file changed, 2 insertions(+), 5 deletions(-)


Reviewed-by: Gavin Shan 

Re: [PATCH-for-9.0 24/25] hw/nvram: Simplify memory_region_init_rom_device() calls

[Manos Pitsidianakis]

On Mon, 20 Nov 2023 23:32, Philippe Mathieu-Daudé  wrote:

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, );
   if (
-   errp
+   !memory_region_init_rom_device(mr, owner, arg3, arg4, arg5, arg6, )
   ) {
   ...
   return;
   }

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé 
---
hw/nvram/nrf51_nvm.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index 7f1db8c423..7b25becd49 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -336,12 +336,9 @@ static void nrf51_nvm_init(Object *obj)
static void nrf51_nvm_realize(DeviceState *dev, Error **errp)
{
NRF51NVMState *s = NRF51_NVM(dev);
-Error *err = NULL;

-memory_region_init_rom_device(>flash, OBJECT(dev), _ops, s,
-"nrf51_soc.flash", s->flash_size, );
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_rom_device(>flash, OBJECT(dev), _ops, s,
+   "nrf51_soc.flash", s->flash_size, 
errp)) {
return;
}

--


Reviewed-by: Manos Pitsidianakis