spapr: Remove NULL checks on error_propagate() calls

[Qemu-devel] [PATCH] spapr: Remove NULL checks on error_propagate() calls

Markus Armbruster posted 1 patch 5 years, 1 month ago

Download mbox

Test docker-clang@ubuntu passed

Test asan passed

Test checkpatch passed

Test docker-mingw@fedora passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190318190148.18283-1-armbru@redhat.com

Maintainers: David Gibson <david@gibson.dropbear.id.au>

hw/ppc/spapr_pci.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH] spapr: Remove NULL checks on error_propagate() calls

Posted by Markus Armbruster 5 years, 1 month ago

Patch created mechanically by rerunning:

  $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
	    --macro-file scripts/cocci-macro-file.h \
	    --dir . --in-place

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/ppc/spapr_pci.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 20915d2b3c..b63ed9d8da 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1488,9 +1488,7 @@ static void spapr_pci_plug(HotplugHandler *plug_handler,
     }
 
 out:
-    if (local_err) {
-        error_propagate(errp, local_err);
-    }
+    error_propagate(errp, local_err);
 }
 
 static void spapr_pci_unplug(HotplugHandler *plug_handler,
-- 
2.17.2

Re: [Qemu-devel] [PATCH] spapr: Remove NULL checks on error_propagate() calls

Posted by David Gibson 5 years, 1 month ago

On Mon, Mar 18, 2019 at 08:01:48PM +0100, Markus Armbruster wrote:
> Patch created mechanically by rerunning:
> 
>   $  spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \
> 	    --macro-file scripts/cocci-macro-file.h \
> 	    --dir . --in-place
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Applied to ppc-for-4.0, thanks.

> ---
>  hw/ppc/spapr_pci.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 20915d2b3c..b63ed9d8da 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -1488,9 +1488,7 @@ static void spapr_pci_plug(HotplugHandler *plug_handler,
>      }
>  
>  out:
> -    if (local_err) {
> -        error_propagate(errp, local_err);
> -    }
> +    error_propagate(errp, local_err);
>  }
>  
>  static void spapr_pci_unplug(HotplugHandler *plug_handler,

-- 
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