From: tixy@linaro.org (Jon Medhurst (Tixy))
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: vexpress: Remove IRQ defines from mach/irq.h
Date: Wed, 13 Jun 2012 18:13:21 +0100 [thread overview]
Message-ID: <1339607602-3846-2-git-send-email-tixy@linaro.org> (raw)
In-Reply-To: <1339607602-3846-1-git-send-email-tixy@linaro.org>
From: Jon Medhurst <tixy@linaro.org>
The irq numbers are only used in one place so remove these defines
and hardcode the value at the location it is used.
This leaves mach/irq.h only containing NR_IRQ and so it is safe
when it gets dropped from inclusion when SPARSE_IRQ is defined.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
---
arch/arm/mach-vexpress/include/mach/irqs.h | 3 ---
arch/arm/mach-vexpress/ct-ca9x4.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/mach-vexpress/include/mach/irqs.h b/arch/arm/mach-vexpress/include/mach/irqs.h
index 4b10ee7..e109c66 100644
--- a/arch/arm/mach-vexpress/include/mach/irqs.h
+++ b/arch/arm/mach-vexpress/include/mach/irqs.h
@@ -1,4 +1 @@
-#define IRQ_LOCALTIMER 29
-#define IRQ_LOCALWDOG 30
-
#define NR_IRQS 256
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index c65cc3b..123d68af 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -45,7 +45,7 @@ static void __init ct_ca9x4_map_io(void)
}
#ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, A9_MPCORE_TWD, IRQ_LOCALTIMER);
+static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, A9_MPCORE_TWD, 29);
static void __init ca9x4_twd_init(void)
{
--
1.7.10
next prev parent reply other threads:[~2012-06-13 17:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 17:13 [PATCH 0/2] ARM: vexpress: Enable SPARSE_IRQ selection Jon Medhurst (Tixy)
2012-06-13 17:13 ` Jon Medhurst (Tixy) [this message]
2012-06-13 17:13 ` [PATCH 2/2] ARM: vexpress: Enable selection of SPARSE_IRQ Jon Medhurst (Tixy)
2012-06-13 19:23 ` Rob Herring
2012-06-14 7:32 ` Jon Medhurst (Tixy)
2012-06-14 8:55 ` [PATCH 0/2] ARM: vexpress: Enable SPARSE_IRQ selection Russell King - ARM Linux
2012-06-14 11:33 ` Jon Medhurst (Tixy)
2012-06-14 11:43 ` [PATCH v2] ARM: vexpress: Enable SPARSE_IRQ Jon Medhurst (Tixy)
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=1339607602-3846-2-git-send-email-tixy@linaro.org \
--to=tixy@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).