[PATCH 4/5] powerpc-MSI-HSTA: Rename jump labels in hsta_msi_probe()

SF Markus Elfring
2016-08-29T11:12:18Z

Date: Mon, 29 Aug 2016 11:22:19 +0200

Adjust jump labels according to the current Linux coding style convention.

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

diff --git a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
index 691db9a..3097ddd 100644
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
@@ -154,14 +154,14 @@ static int hsta_msi_probe(struct platform_device *pdev)

ret = msi_bitmap_alloc(&ppc4xx_hsta_msi.bmp, irq_count, dev->of_node);
if (ret)
- goto out;
+ goto unmap_io;

ppc4xx_hsta_msi.irq_map = kmalloc_array(irq_count,
sizeof(*ppc4xx_hsta_msi.irq_map),
GFP_KERNEL);
if (!ppc4xx_hsta_msi.irq_map) {
ret = -ENOMEM;
- goto out1;
+ goto free_bitmap;
}

/* Setup a mapping from irq offsets to hardware irq numbers */
@@ -171,7 +171,7 @@ static int hsta_msi_probe(struct platform_device *pdev)
if (ppc4xx_hsta_msi.irq_map[irq] = NO_IRQ) {
dev_err(dev, "Unable to map IRQ\n");
ret = -EINVAL;
- goto out2;
+ goto free_irq_map;
}
}

@@ -180,14 +180,11 @@ static int hsta_msi_probe(struct platform_device *pdev)
phb->controller_ops.teardown_msi_irqs = hsta_teardown_msi_irqs;
}
return 0;
-
-out2:
+ free_irq_map:
kfree(ppc4xx_hsta_msi.irq_map);
-
-out1:
+ free_bitmap:
msi_bitmap_free(&ppc4xx_hsta_msi.bmp);
-
-out:
+ unmap_io:
iounmap(ppc4xx_hsta_msi.data);
return ret;
}
--
2.9.3