From: Colin Cross <ccross@android.com>
To: linux-tegra@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, olof@lixom.net,
konkers@android.com, Colin Cross <ccross@android.com>,
Russell King <linux@arm.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts
Date: Tue, 25 Jan 2011 23:10:37 -0800 [thread overview]
Message-ID: <AANLkTiniMu1Y_q5W=Fui0CNc99MJB5eCkeiVe8JJoO_D@mail.gmail.com> (raw)
In-Reply-To: <1295834493-5019-2-git-send-email-ccross@android.com>
On Sun, Jan 23, 2011 at 6:01 PM, Colin Cross <ccross@android.com> wrote:
> A future patch will export gic_mask_irq and gic_unmask_irq.
> Rename the pointers in arch/arm/mach-tegra/irq.c to avoid
> a compile error.
>
> Signed-off-by: Colin Cross <ccross@android.com>
> ---
> arch/arm/mach-tegra/irq.c | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
> index de7dfad..17c74d2 100644
> --- a/arch/arm/mach-tegra/irq.c
> +++ b/arch/arm/mach-tegra/irq.c
> @@ -46,24 +46,24 @@
> #define ICTLR_COP_IER_CLR 0x38
> #define ICTLR_COP_IEP_CLASS 0x3c
>
> -static void (*gic_mask_irq)(struct irq_data *d);
> -static void (*gic_unmask_irq)(struct irq_data *d);
> +static void (*tegra_gic_mask_irq)(struct irq_data *d);
> +static void (*tegra_gic_unmask_irq)(struct irq_data *d);
>
> -#define irq_to_ictlr(irq) (((irq)-32) >> 5)
> +#define irq_to_ictlr(irq) (((irq) - 32) >> 5)
> static void __iomem *tegra_ictlr_base = IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE);
> -#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr)*0x100)
> +#define ictlr_to_virt(ictlr) (tegra_ictlr_base + (ictlr) * 0x100)
>
> static void tegra_mask(struct irq_data *d)
> {
> void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
> - gic_mask_irq(d);
> - writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_CLR);
> + tegra_gic_mask_irq(d);
> + writel(1 << (d->irq & 31), addr+ICTLR_CPU_IER_CLR);
> }
>
> static void tegra_unmask(struct irq_data *d)
> {
> void __iomem *addr = ictlr_to_virt(irq_to_ictlr(d->irq));
> - gic_unmask_irq(d);
> + tegra_gic_unmask_irq(d);
> writel(1<<(d->irq&31), addr+ICTLR_CPU_IER_SET);
> }
>
> @@ -98,8 +98,8 @@ void __init tegra_init_irq(void)
> IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
>
> gic = get_irq_chip(29);
> - gic_unmask_irq = gic->irq_unmask;
> - gic_mask_irq = gic->irq_mask;
> + tegra_gic_unmask_irq = gic->irq_unmask;
> + tegra_gic_mask_irq = gic->irq_mask;
> tegra_irq.irq_ack = gic->irq_ack;
> #ifdef CONFIG_SMP
> tegra_irq.irq_set_affinity = gic->irq_set_affinity;
> --
> 1.7.3.1
If there are no objections, I'm going to put this patch into
tegra/for-linus for a pull request for 2.6.38-rc3.
next prev parent reply other threads:[~2011-01-26 7:10 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1295834493-5019-1-git-send-email-ccross@android.com>
2011-01-24 2:01 ` [PATCH v2 01/28] ARM: tegra: irq: Rename gic pointers to avoid conflicts Colin Cross
2011-01-26 7:10 ` Colin Cross [this message]
2011-01-24 2:01 ` [PATCH v2 02/28] ARM: gic: Add functions to save and restore gic state Colin Cross
2011-02-01 13:03 ` Russell King - ARM Linux
2011-01-24 2:01 ` [PATCH v2 03/28] ARM: gic: Export irq chip functions Colin Cross
2011-01-24 6:39 ` Santosh Shilimkar
2011-01-24 2:01 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support for re-enabling l2x0 Colin Cross
2011-01-25 15:14 ` Catalin Marinas
2011-01-25 15:41 ` Russell King - ARM Linux
2011-01-25 18:14 ` Catalin Marinas
2011-01-25 18:32 ` Santosh Shilimkar
[not found] ` <-8932138696981683633@unknownmsgid>
2011-02-04 23:32 ` Colin Cross
2011-02-04 23:43 ` Russell King - ARM Linux
2011-02-05 1:44 ` Colin Cross
2011-02-05 7:51 ` Santosh Shilimkar
2011-02-05 9:47 ` Russell King - ARM Linux
2011-02-05 10:41 ` [PATCH v2 04/28] ARM: mm: cache-l2x0: Add support forre-enabling l2x0 Santosh Shilimkar
2011-02-05 16:36 ` Colin Cross
2011-02-07 6:13 ` Santosh Shilimkar
2011-01-24 2:01 ` [PATCH v2 05/28] ARM: tegra: Centralize macros to define debug uart base Colin Cross
2011-01-24 2:01 ` [PATCH v2 06/28] ARM: tegra: Add api to control internal powergating Colin Cross
2011-01-24 2:01 ` [PATCH v2 07/28] ARM: tegra: irqs: Update irq list Colin Cross
2011-01-24 2:01 ` [PATCH v2 08/28] ARM: tegra: Add prototypes for subsystem suspend functions Colin Cross
2011-01-24 2:01 ` [PATCH v2 09/28] ARM: tegra: clock: Suspend fixes, and add new clocks Colin Cross
2011-01-24 2:01 ` [PATCH v2 10/28] ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Colin Cross
2011-01-24 2:01 ` [PATCH v2 11/28] ARM: tegra: timer: Add idle and suspend support to timers Colin Cross
2011-01-24 2:01 ` [PATCH v2 12/28] ARM: tegra: irq: Add support for suspend wake sources Colin Cross
2011-01-24 2:01 ` [PATCH v2 13/28] ARM: tegra: Add suspend and hotplug support Colin Cross
2011-01-24 7:31 ` Colin Cross
2011-01-24 9:07 ` Russell King - ARM Linux
2011-01-24 9:26 ` Colin Cross
2011-01-24 10:15 ` Russell King - ARM Linux
2011-01-24 2:01 ` [PATCH v2 14/28] ARM: tegra: irq: Add set_wake and set_type support for suspend Colin Cross
2011-01-24 2:01 ` [PATCH v2 15/28] ARM: tegra: irq: Add debugfs file to show wake irqs Colin Cross
2011-01-27 19:45 ` Stephen Boyd
2011-01-24 2:01 ` [PATCH v2 16/28] ARM: tegra: irq: Implement retrigger Colin Cross
2011-01-24 2:01 ` [PATCH v2 17/28] ARM: tegra: gpio: Add support for waking from suspend Colin Cross
2011-01-24 2:01 ` [PATCH v2 18/28] ARM: tegra: add CPU_IDLE driver Colin Cross
2011-01-27 20:38 ` Stephen Boyd
2011-01-27 21:51 ` Colin Cross
2011-01-27 22:07 ` Colin Cross
2011-01-24 2:01 ` [PATCH v2 19/28] ARM: tegra: iomap: Add missing devices, fix use of SZ_8, SZ_64 Colin Cross
2011-01-24 2:01 ` [PATCH v2 20/28] ARM: tegra: cpufreq: Disable cpufreq during suspend Colin Cross
2011-01-24 14:41 ` Mark Brown
2011-01-24 18:50 ` Colin Cross
2011-01-24 19:35 ` Mark Brown
2011-01-24 19:52 ` Colin Cross
2011-01-24 20:26 ` Mark Brown
2011-01-24 20:52 ` Colin Cross
2011-01-24 21:08 ` Mark Brown
2011-01-24 21:24 ` Colin Cross
2011-01-25 4:26 ` Kyungmin Park
2011-01-24 2:01 ` [PATCH v2 21/28] ARM: tegra: Allow overriding arch_reset Colin Cross
2011-01-24 2:01 ` [PATCH v2 22/28] ARM: tegra: dma: Fix critical data corruption bugs Colin Cross
2011-01-24 2:01 ` [PATCH v2 23/28] ARM: tegra: add tegra_defconfig Colin Cross
2011-01-24 2:01 ` [PATCH v2 24/28] ARM: tegra: Use writel_relaxed in tegra_init_cache Colin Cross
2011-01-24 2:01 ` [PATCH v2 25/28] ARM: tegra: suspend: Save protected aperture across LP0 Colin Cross
2011-01-24 2:01 ` [PATCH v2 26/28] ARM: tegra: suspend: protect suspend functions with CONFIG_PM Colin Cross
2011-01-24 2:01 ` [PATCH v2 27/28] ARM: tegra: enable emc clock updates after lp0 Colin Cross
2011-01-24 2:01 ` [PATCH v2 28/28] ARM: tegra: clock: Add forward reference to struct clk Colin Cross
2011-01-24 10:26 ` Russell King - ARM Linux
2011-01-25 1:23 ` Colin Cross
2011-01-26 3:19 ` Grant Likely
2011-01-26 3:21 ` Colin Cross
2011-01-26 4:16 ` Grant Likely
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='AANLkTiniMu1Y_q5W=Fui0CNc99MJB5eCkeiVe8JJoO_D@mail.gmail.com' \
--to=ccross@android.com \
--cc=konkers@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
/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).