devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sricharan R <r.sricharan@ti.com>
To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org
Cc: tony@atomide.com, santosh.shilimkar@ti.com, nm@ti.com,
	rnayak@ti.com, tglx@linutronix.de, linux@arm.linux.org.uk,
	r.sricharan@ti.com
Subject: [PATCH 08/14] irqchip: crossbar: change the goto naming
Date: Tue, 3 Jun 2014 13:13:00 +0530	[thread overview]
Message-ID: <1401781386-4982-9-git-send-email-r.sricharan@ti.com> (raw)
In-Reply-To: <1401781386-4982-1-git-send-email-r.sricharan@ti.com>

From: Nishanth Menon <nm@ti.com>

Using err1,2,3,4 etc makes it hard to ensure a new exit path in the
middle will not result in spurious changes, so rename the error paths
as per the function it does.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/irqchip/irq-crossbar.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index 524e6e9..cf0d79f 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -152,17 +152,17 @@ static int __init crossbar_of_init(struct device_node *node,
 
 	cb->crossbar_base = of_iomap(node, 0);
 	if (!cb->crossbar_base)
-		goto err1;
+		goto err_cb;
 
 	of_property_read_u32(node, "ti,max-irqs", &max);
 	if (!max) {
 		pr_err("missing 'ti,max-irqs' property\n");
 		ret = -EINVAL;
-		goto err2;
+		goto err_base;
 	}
 	cb->irq_map = kcalloc(max, sizeof(int), GFP_KERNEL);
 	if (!cb->irq_map)
-		goto err2;
+		goto err_base;
 
 	cb->int_max = max;
 
@@ -181,7 +181,7 @@ static int __init crossbar_of_init(struct device_node *node,
 			if (entry > max) {
 				pr_err("Invalid reserved entry\n");
 				ret = -EINVAL;
-				goto err3;
+				goto err_irq_map;
 			}
 			cb->irq_map[entry] = IRQ_RESERVED;
 		}
@@ -189,7 +189,7 @@ static int __init crossbar_of_init(struct device_node *node,
 
 	cb->register_offsets = kcalloc(max, sizeof(int), GFP_KERNEL);
 	if (!cb->register_offsets)
-		goto err3;
+		goto err_irq_map;
 
 	of_property_read_u32(node, "ti,reg-size", &size);
 
@@ -206,7 +206,7 @@ static int __init crossbar_of_init(struct device_node *node,
 	default:
 		pr_err("Invalid reg-size property\n");
 		ret = -EINVAL;
-		goto err4;
+		goto err_reg_offset;
 		break;
 	}
 
@@ -234,7 +234,7 @@ static int __init crossbar_of_init(struct device_node *node,
 			if (entry > max) {
 				pr_err("Invalid skip entry\n");
 				ret = -EINVAL;
-				goto err4;
+				goto err_reg_offset;
 			}
 			cb->irq_map[entry] = IRQ_SKIP;
 		}
@@ -251,13 +251,13 @@ static int __init crossbar_of_init(struct device_node *node,
 	register_routable_domain_ops(&routable_irq_domain_ops);
 	return 0;
 
-err4:
+err_reg_offset:
 	kfree(cb->register_offsets);
-err3:
+err_irq_map:
 	kfree(cb->irq_map);
-err2:
+err_base:
 	iounmap(cb->crossbar_base);
-err1:
+err_cb:
 	kfree(cb);
 	return ret;
 }
-- 
1.7.9.5


  parent reply	other threads:[~2014-06-03  7:43 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-03  7:42 [PATCH 00/14] irqchip: crossbar: driver fixes Sricharan R
2014-06-03  7:42 ` [PATCH 01/14] irqchip: crossbar: remove IS_ERR_VALUE check Sricharan R
2014-06-03  7:42 ` [PATCH 02/14] irqchip: crossbar: fix sparse warnings Sricharan R
2014-06-03  7:42 ` [PATCH 03/14] irqchip: crossbar: fix checkpatch warning Sricharan R
2014-06-03  7:42 ` [PATCH 04/14] irqchip: crossbar: fix kerneldoc warning Sricharan R
2014-06-03  7:42 ` [PATCH 05/14] irqchip: crossbar: DRA7: Fix unused crossbar list Sricharan R
2014-06-03  7:42 ` [PATCH 06/14] irqchip: crossbar: fix memory leak incase of invalid entry Sricharan R
2014-06-03  7:42 ` [PATCH 07/14] irqchip: crossbar: return proper error value Sricharan R
2014-06-03  7:43 ` Sricharan R [this message]
2014-06-03  7:43 ` [PATCH 09/14] irqchip: crossbar: set cb pointer to null in case of error Sricharan R
2014-06-03  7:43 ` [PATCH 10/14] irqchip: crossbar: Add kerneldoc for crossbar_domain_unmap callback Sricharan R
2014-06-03  7:43 ` [PATCH 11/14] irqchip: crossbar: introduce ti,max-crossbar-sources to identify valid crossbar mapping Sricharan R
2014-06-03  7:43 ` [PATCH 12/14] irqchip: crossbar: introduce centralized check for crossbar write Sricharan R
2014-06-03  7:43 ` [PATCH 13/14] Documentation: dt: OMAP: crossbar: add description for interrupt consumer Sricharan R
2014-06-03  7:43 ` [PATCH 14/14] irqchip: crossbar allow for quirky hardware with direct hardwiring of GIC Sricharan R
2014-06-03 18:28 ` [PATCH 00/14] irqchip: crossbar: driver fixes Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401781386-4982-9-git-send-email-r.sricharan@ti.com \
    --to=r.sricharan@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=nm@ti.com \
    --cc=rnayak@ti.com \
    --cc=santosh.shilimkar@ti.com \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).