[3.16.y-ckt stable] Patch "ARM: OMAP2+: board-generic: Remove stale of_irq macros" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Mon Oct 26 21:14:48 UTC 2015


This is a note to let you know that I have just added a patch titled

    ARM: OMAP2+: board-generic: Remove stale of_irq macros

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.19.8-ckt9.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From d138d91800392d2849491c4cd8d3ead70918fb2f Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm at ti.com>
Date: Wed, 9 Sep 2015 16:18:12 -0500
Subject: ARM: OMAP2+: board-generic: Remove stale of_irq macros

commit a3b7470951ab49e5592d20c2bcfe5ee675221591 upstream.

When commit c4082d499fa2 ("ARM: omap2+: board-generic: clean up the
irq data from board file") cleaned up the direct usage of gic_of_init
and omap_intc_of_init, it failed to clean up the macros properly.

Since these macros are no longer used, lets just remove them.

Fixes: c4082d499fa2 ("ARM: omap2+: board-generic: clean up the irq data from board file")
Reported-by: Carlos Hernandez <ceh at ti.com>
Signed-off-by: Nishanth Menon <nm at ti.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 arch/arm/mach-omap2/board-generic.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index b61c049..39cdeb0 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -20,13 +20,6 @@

 #include "common.h"

-#if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
-#define intc_of_init	NULL
-#endif
-#ifndef CONFIG_ARCH_OMAP4
-#define gic_of_init		NULL
-#endif
-
 static const struct of_device_id omap_dt_match_table[] __initconst = {
 	{ .compatible = "simple-bus", },
 	{ .compatible = "ti,omap-infra", },
--
1.9.1





More information about the kernel-team mailing list