[PATCH 5/5] powerpc-MSI-HSTA: Move three assignments in hsta_msi_probe()

From	SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups	linux.kernel
Subject	[PATCH 5/5] powerpc-MSI-HSTA: Move three assignments in hsta_msi_probe()
Date	2016-08-29 13:20 +0200
Message-ID	<sbsLD-6Cn-17@gated-at.bofh.it> (permalink)
References	<qEuGl-43C-5@gated-at.bofh.it> <sbsBX-6z7-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 29 Aug 2016 11:30:48 +0200

Move the assignments for three data structure members to the end
so that they will only be performed if the desired resource allocations
succeeded by this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index 3097ddd..57014ce 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -143,10 +143,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	ppc4xx_hsta_msi.dev = dev;
-	ppc4xx_hsta_msi.address = mem->start;
 	ppc4xx_hsta_msi.data = ioremap(mem->start, resource_size(mem));
-	ppc4xx_hsta_msi.irq_count = irq_count;
 	if (!ppc4xx_hsta_msi.data) {
 		dev_err(dev, "Unable to map memory\n");
 		return -ENOMEM;
@@ -179,6 +176,10 @@ static int hsta_msi_probe(struct platform_device *pdev)
 		phb->controller_ops.setup_msi_irqs = hsta_setup_msi_irqs;
 		phb->controller_ops.teardown_msi_irqs = hsta_teardown_msi_irqs;
 	}
+
+	ppc4xx_hsta_msi.dev = dev;
+	ppc4xx_hsta_msi.address = mem->start;
+	ppc4xx_hsta_msi.irq_count = irq_count;
 	return 0;
  free_irq_map:
 	kfree(ppc4xx_hsta_msi.irq_map);
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] PowerPC: Fine-tuning for three function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:10 +0200
  [PATCH 1/5] powerpc-mpic: Use kmalloc_array() in mpic_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:10 +0200
  [PATCH 3/5] powerpc-MSI-HSTA: Use kmalloc_array() in hsta_msi_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:20 +0200
  [PATCH 4/5] powerpc-MSI-HSTA: Rename jump labels in hsta_msi_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:20 +0200
  [PATCH 2/5] powerpc-MSI: Use kmalloc_array() in  ppc4xx_setup_msi_irqs() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:20 +0200
  [PATCH 5/5] powerpc-MSI-HSTA: Move three assignments in  hsta_msi_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-29 13:20 +0200

csiph-web