From: Omar Ramirez Luna <omar.ramirez@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>,
l-o <linux-omap@vger.kernel.org>,
lak <linux-arm-kernel@lists.infradead.org>,
sricharan <r.sricharan@ti.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Felipe Balbi <balbi@ti.com>, Benoit Cousson <b-cousson@ti.com>,
Sergei Shtylyov <sshtylyov@mvista.com>,
Omar Ramirez Luna <omar.ramirez@ti.com>
Subject: [PATCH 5/5] OMAP4: l3: minor cleanup for parenthesis and extra spaces
Date: Tue, 29 Mar 2011 11:20:19 -0600 [thread overview]
Message-ID: <1301419219-30547-6-git-send-email-omar.ramirez@ti.com> (raw)
In-Reply-To: <1301419219-30547-1-git-send-email-omar.ramirez@ti.com>
Removing unneeded parenthesis and two consecutive spaces around:
std_err_main = readl(std_err_main_addr);
^^
While at it collapsing an if statement to detect the type of error
based on the irq received.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
arch/arm/mach-omap2/omap_l3_noc.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c
index def3de8..7b9f190 100644
--- a/arch/arm/mach-omap2/omap_l3_noc.c
+++ b/arch/arm/mach-omap2/omap_l3_noc.c
@@ -63,10 +63,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
char *source_name;
/* Get the Type of interrupt */
- if (irq == l3->app_irq)
- inttype = L3_APPLICATION_ERROR;
- else
- inttype = L3_DEBUG_ERROR;
+ inttype = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
for (i = 0; i < L3_MODULES; i++) {
/*
@@ -84,10 +81,10 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
err_src = j;
/* Read the stderrlog_main_source from clk domain */
- std_err_main_addr = base + (*(l3_targ[i] + err_src));
- std_err_main = readl(std_err_main_addr);
+ std_err_main_addr = base + *(l3_targ[i] + err_src);
+ std_err_main = readl(std_err_main_addr);
- switch ((std_err_main & CUSTOM_ERROR)) {
+ switch (std_err_main & CUSTOM_ERROR) {
case STANDARD_ERROR:
source_name =
l3_targ_stderrlog_main_name[i][err_src];
@@ -143,7 +140,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[0] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[0])) {
+ if (!l3->l3_base[0]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err0;
@@ -157,7 +154,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[1] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[1])) {
+ if (!l3->l3_base[1]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err1;
@@ -171,7 +168,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[2] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[2])) {
+ if (!l3->l3_base[2]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err2;
--
1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: omar.ramirez@ti.com (Omar Ramirez Luna)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] OMAP4: l3: minor cleanup for parenthesis and extra spaces
Date: Tue, 29 Mar 2011 11:20:19 -0600 [thread overview]
Message-ID: <1301419219-30547-6-git-send-email-omar.ramirez@ti.com> (raw)
In-Reply-To: <1301419219-30547-1-git-send-email-omar.ramirez@ti.com>
Removing unneeded parenthesis and two consecutive spaces around:
std_err_main = readl(std_err_main_addr);
^^
While at it collapsing an if statement to detect the type of error
based on the irq received.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
arch/arm/mach-omap2/omap_l3_noc.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c
index def3de8..7b9f190 100644
--- a/arch/arm/mach-omap2/omap_l3_noc.c
+++ b/arch/arm/mach-omap2/omap_l3_noc.c
@@ -63,10 +63,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
char *source_name;
/* Get the Type of interrupt */
- if (irq == l3->app_irq)
- inttype = L3_APPLICATION_ERROR;
- else
- inttype = L3_DEBUG_ERROR;
+ inttype = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
for (i = 0; i < L3_MODULES; i++) {
/*
@@ -84,10 +81,10 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
err_src = j;
/* Read the stderrlog_main_source from clk domain */
- std_err_main_addr = base + (*(l3_targ[i] + err_src));
- std_err_main = readl(std_err_main_addr);
+ std_err_main_addr = base + *(l3_targ[i] + err_src);
+ std_err_main = readl(std_err_main_addr);
- switch ((std_err_main & CUSTOM_ERROR)) {
+ switch (std_err_main & CUSTOM_ERROR) {
case STANDARD_ERROR:
source_name =
l3_targ_stderrlog_main_name[i][err_src];
@@ -143,7 +140,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[0] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[0])) {
+ if (!l3->l3_base[0]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err0;
@@ -157,7 +154,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[1] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[1])) {
+ if (!l3->l3_base[1]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err1;
@@ -171,7 +168,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
}
l3->l3_base[2] = ioremap(res->start, resource_size(res));
- if (!(l3->l3_base[2])) {
+ if (!l3->l3_base[2]) {
dev_err(&pdev->dev, "ioremap failed\n");
ret = -ENOMEM;
goto err2;
--
1.7.1
next prev parent reply other threads:[~2011-03-29 17:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 17:20 [PATCH 0/5] OMAP: l3: fixes and cleanup Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna
2011-03-29 17:20 ` [PATCH 1/5] OMAP3: l3: fix for "irq 10: nobody cared" message Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna
2011-03-30 6:27 ` Santosh Shilimkar
2011-03-30 6:27 ` Santosh Shilimkar
2011-03-29 17:20 ` [PATCH 2/5] OMAP3: l3: fix omap3_l3_probe error path Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna
2011-03-30 6:36 ` Santosh Shilimkar
2011-03-30 6:36 ` Santosh Shilimkar
2011-03-29 17:20 ` [PATCH 3/5] OMAP3: l3: minor cleanup for error message, parenthesis and extra lines Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna
2011-03-29 17:20 ` [PATCH 4/5] OMAP4: l3: fix omap4_l3_probe error path Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna
2011-03-29 17:20 ` Omar Ramirez Luna [this message]
2011-03-29 17:20 ` [PATCH 5/5] OMAP4: l3: minor cleanup for parenthesis and extra spaces Omar Ramirez Luna
2011-03-30 6:45 ` [PATCH 0/5] OMAP: l3: fixes and cleanup Santosh Shilimkar
2011-03-30 6:45 ` Santosh Shilimkar
2011-03-31 22:05 ` Ramirez Luna, Omar
2011-03-31 22:05 ` Ramirez Luna, Omar
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=1301419219-30547-6-git-send-email-omar.ramirez@ti.com \
--to=omar.ramirez@ti.com \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=r.sricharan@ti.com \
--cc=santosh.shilimkar@ti.com \
--cc=sshtylyov@mvista.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.