From: Michal Simek <monstr@monstr.eu>
To: robherring2@gmail.com
Cc: grant.likely@secretlab.ca, devicetree-discuss@lists.ozlabs.org,
anton.vorontsov@linaro.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] microblaze: intc: Change variable name
Date: Fri, 9 Dec 2011 12:45:18 +0100 [thread overview]
Message-ID: <1323431121-12780-2-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1323431121-12780-1-git-send-email-monstr@monstr.eu>
intr_type is mask - change name.
s/intr_type/intr_mask/g
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/kernel/intc.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index da33e45..1293098 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -99,7 +99,7 @@ unsigned int get_irq(struct pt_regs *regs)
void __init init_IRQ(void)
{
- u32 i, intr_type;
+ u32 i, intr_mask;
struct device_node *intc = NULL;
#ifdef CONFIG_SELFMOD_INTC
unsigned int intc_baseaddr = 0;
@@ -122,10 +122,9 @@ void __init init_IRQ(void)
nr_irq = be32_to_cpup(of_get_property(intc,
"xlnx,num-intr-inputs", NULL));
- intr_type =
- be32_to_cpup(of_get_property(intc,
- "xlnx,kind-of-intr", NULL));
- if (intr_type > (u32)((1ULL << nr_irq) - 1))
+ intr_mask =
+ be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));
+ if (intr_mask > (u32)((1ULL << nr_irq) - 1))
printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
#ifdef CONFIG_SELFMOD_INTC
@@ -147,7 +146,7 @@ void __init init_IRQ(void)
out_be32(intc_baseaddr + MER, MER_HIE | MER_ME);
for (i = 0; i < nr_irq; ++i) {
- if (intr_type & (0x00000001 << i)) {
+ if (intr_mask & (0x00000001 << i)) {
irq_set_chip_and_handler_name(i, &intc_dev,
handle_edge_irq, "edge");
irq_clear_status_flags(i, IRQ_LEVEL);
--
1.7.5.4
next prev parent reply other threads:[~2011-12-09 11:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-09 11:45 [PATCH 1/5] microblaze: Use of_find_compatible_node for timer and Michal Simek
2011-12-09 11:45 ` Michal Simek [this message]
2011-12-09 11:45 ` [PATCH 3/5] microblaze: Use irq_of_parse_and_map for timer Michal Simek
2011-12-09 11:45 ` [PATCH 4/5] microblaze: Change NO_IRQ to 0 Michal Simek
2011-12-09 11:45 ` [PATCH 5/5] microblaze: Introduce IRQ_SW_OFFSET to help with sw IRQ Michal Simek
2011-12-09 14:12 ` Rob Herring
2011-12-10 10:41 ` Michal Simek
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=1323431121-12780-2-git-send-email-monstr@monstr.eu \
--to=monstr@monstr.eu \
--cc=anton.vorontsov@linaro.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=robherring2@gmail.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
all inboxes | Powered by JetHome®