* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
@ 2015-10-02 16:24 Marc Zyngier
2015-10-04 23:52 ` Krzysztof Kozlowski
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Marc Zyngier @ 2015-10-02 16:24 UTC (permalink / raw)
To: linux-arm-kernel
Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
it becomes possible to cleanup the open-coded versions of the same
macro that have been added to some private irqchips implementations.
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/mach-exynos/suspend.c | 3 ++-
arch/arm/mach-imx/gpc.c | 8 ++------
arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index e00eb39..dfb1fcf 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -19,6 +19,7 @@
#include <linux/cpu_pm.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/err.h>
@@ -262,7 +263,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
return 0;
}
-#define EXYNOS_PMU_IRQ(symbol, name) OF_DECLARE_2(irqchip, symbol, name, exynos_pmu_irq_init)
+#define EXYNOS_PMU_IRQ(symbol, name) IRQCHIP_DECLARE(symbol, name, exynos_pmu_irq_init)
EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 8c4467f..f2783b0 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -14,6 +14,7 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
@@ -268,12 +269,7 @@ static int __init imx_gpc_init(struct device_node *node,
return 0;
}
-
-/*
- * We cannot use the IRQCHIP_DECLARE macro that lives in
- * drivers/irqchip, so we're forced to roll our own. Not very nice.
- */
-OF_DECLARE_2(irqchip, imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);
+IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);
void __init imx_gpc_check_dt(void)
{
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index e1d2e99..0f8c1d1 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/platform_device.h>
@@ -537,9 +538,4 @@ static int __init wakeupgen_init(struct device_node *node,
return 0;
}
-
-/*
- * We cannot use the IRQCHIP_DECLARE macro that lives in
- * drivers/irqchip, so we're forced to roll our own. Not very nice.
- */
-OF_DECLARE_2(irqchip, ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
+IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
@ 2015-10-04 23:52 ` Krzysztof Kozlowski
2015-10-06 15:29 ` Marc Zyngier
2015-10-08 6:49 ` Shawn Guo
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2015-10-04 23:52 UTC (permalink / raw)
To: linux-arm-kernel
On 03.10.2015 01:24, Marc Zyngier wrote:
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/mach-exynos/suspend.c | 3 ++-
I guess you want to push it through the tip tree? If yes, then for Samsung:
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
(if not then please split it per mach)
Best regards,
Krzysztof
> arch/arm/mach-imx/gpc.c | 8 ++------
> arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------
> 3 files changed, 6 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-04 23:52 ` Krzysztof Kozlowski
@ 2015-10-06 15:29 ` Marc Zyngier
0 siblings, 0 replies; 9+ messages in thread
From: Marc Zyngier @ 2015-10-06 15:29 UTC (permalink / raw)
To: linux-arm-kernel
On 05/10/15 00:52, Krzysztof Kozlowski wrote:
> On 03.10.2015 01:24, Marc Zyngier wrote:
>> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
>> it becomes possible to cleanup the open-coded versions of the same
>> macro that have been added to some private irqchips implementations.
>>
>> Cc: Kukjin Kim <kgene@kernel.org>
>> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> Cc: Shawn Guo <shawnguo@kernel.org>
>> Cc: Sascha Hauer <kernel@pengutronix.de>
>> Cc: Tony Lindgren <tony@atomide.com>
>> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
>> ---
>> arch/arm/mach-exynos/suspend.c | 3 ++-
>
> I guess you want to push it through the tip tree? If yes, then for Samsung:
> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>
> (if not then please split it per mach)
I was more angling to have it directly picked up via arm-soc. But
otherwise yes, I can get it merged via tip if everyone agrees to it.
Splitting it per platform is a waste of time.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
2015-10-04 23:52 ` Krzysztof Kozlowski
@ 2015-10-08 6:49 ` Shawn Guo
2015-10-12 19:07 ` Kukjin Kim
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Shawn Guo @ 2015-10-08 6:49 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 02, 2015 at 05:24:17PM +0100, Marc Zyngier wrote:
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
...
> arch/arm/mach-imx/gpc.c | 8 ++------
Acked-by: Shawn Guo <shawnguo@kernel.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
2015-10-04 23:52 ` Krzysztof Kozlowski
2015-10-08 6:49 ` Shawn Guo
@ 2015-10-12 19:07 ` Kukjin Kim
2015-10-12 20:47 ` Tony Lindgren
2015-10-13 14:15 ` Joel Porquet
4 siblings, 0 replies; 9+ messages in thread
From: Kukjin Kim @ 2015-10-12 19:07 UTC (permalink / raw)
To: linux-arm-kernel
On 10/03/15 01:24, Marc Zyngier wrote:
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Kukjin Kim <kgene@kernel.org>
Acked-by: Kukjin Kim <kgene@kernel.org>
Thanks,
Kukjin
> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/mach-exynos/suspend.c | 3 ++-
> arch/arm/mach-imx/gpc.c | 8 ++------
> arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------
> 3 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
> index e00eb39..dfb1fcf 100644
> --- a/arch/arm/mach-exynos/suspend.c
> +++ b/arch/arm/mach-exynos/suspend.c
> @@ -19,6 +19,7 @@
> #include <linux/cpu_pm.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> +#include <linux/irqchip.h>
> #include <linux/irqdomain.h>
> #include <linux/of_address.h>
> #include <linux/err.h>
> @@ -262,7 +263,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
> return 0;
> }
>
> -#define EXYNOS_PMU_IRQ(symbol, name) OF_DECLARE_2(irqchip, symbol, name, exynos_pmu_irq_init)
> +#define EXYNOS_PMU_IRQ(symbol, name) IRQCHIP_DECLARE(symbol, name, exynos_pmu_irq_init)
>
> EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
> EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
[...]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
` (2 preceding siblings ...)
2015-10-12 19:07 ` Kukjin Kim
@ 2015-10-12 20:47 ` Tony Lindgren
2015-10-13 14:15 ` Joel Porquet
4 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2015-10-12 20:47 UTC (permalink / raw)
To: linux-arm-kernel
* Marc Zyngier <marc.zyngier@arm.com> [151002 09:28]:
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
For omap:
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
` (3 preceding siblings ...)
2015-10-12 20:47 ` Tony Lindgren
@ 2015-10-13 14:15 ` Joel Porquet
4 siblings, 0 replies; 9+ messages in thread
From: Joel Porquet @ 2015-10-13 14:15 UTC (permalink / raw)
To: linux-arm-kernel
Marc Zyngier <marc.zyngier <at> arm.com> writes:
>
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Kukjin Kim <kgene <at> kernel.org>
> Cc: Krzysztof Kozlowski <k.kozlowski <at> samsung.com>
> Cc: Shawn Guo <shawnguo <at> kernel.org>
> Cc: Sascha Hauer <kernel <at> pengutronix.de>
> Cc: Tony Lindgren <tony <at> atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier <at> arm.com>
> ---
> arch/arm/mach-exynos/suspend.c | 3 ++-
> arch/arm/mach-imx/gpc.c | 8 ++------
> arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------
> 3 files changed, 6 insertions(+), 13 deletions(-)
I had suggested the same patch a few months ago
(https://lkml.org/lkml/2015/7/7/1069) but without success although it had
been acked by everybody :/
I didn't know how to have it pushed all at once...
Suggested-by: Joel Porquet <joel@porquet.org>
Thanks,
Jo?l
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
@ 2015-10-16 14:21 Marc Zyngier
2015-10-22 16:53 ` Olof Johansson
0 siblings, 1 reply; 9+ messages in thread
From: Marc Zyngier @ 2015-10-16 14:21 UTC (permalink / raw)
To: linux-arm-kernel
Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
it becomes possible to cleanup the open-coded versions of the same
macro that have been added to some private irqchips implementations.
Cc: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Kukjin Kim <kgene@kernel.org>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/mach-exynos/suspend.c | 3 ++-
arch/arm/mach-imx/gpc.c | 8 ++------
arch/arm/mach-omap2/omap-wakeupgen.c | 8 ++------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index e00eb39..dfb1fcf 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -19,6 +19,7 @@
#include <linux/cpu_pm.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/err.h>
@@ -262,7 +263,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
return 0;
}
-#define EXYNOS_PMU_IRQ(symbol, name) OF_DECLARE_2(irqchip, symbol, name, exynos_pmu_irq_init)
+#define EXYNOS_PMU_IRQ(symbol, name) IRQCHIP_DECLARE(symbol, name, exynos_pmu_irq_init)
EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 8c4467f..f2783b0 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -14,6 +14,7 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
@@ -268,12 +269,7 @@ static int __init imx_gpc_init(struct device_node *node,
return 0;
}
-
-/*
- * We cannot use the IRQCHIP_DECLARE macro that lives in
- * drivers/irqchip, so we're forced to roll our own. Not very nice.
- */
-OF_DECLARE_2(irqchip, imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);
+IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);
void __init imx_gpc_check_dt(void)
{
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index e1d2e99..0f8c1d1 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
#include <linux/platform_device.h>
@@ -537,9 +538,4 @@ static int __init wakeupgen_init(struct device_node *node,
return 0;
}
-
-/*
- * We cannot use the IRQCHIP_DECLARE macro that lives in
- * drivers/irqchip, so we're forced to roll our own. Not very nice.
- */
-OF_DECLARE_2(irqchip, ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
+IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE
2015-10-16 14:21 Marc Zyngier
@ 2015-10-22 16:53 ` Olof Johansson
0 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2015-10-22 16:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 16, 2015 at 03:21:10PM +0100, Marc Zyngier wrote:
> Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
> it becomes possible to cleanup the open-coded versions of the same
> macro that have been added to some private irqchips implementations.
>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Acked-by: Kukjin Kim <kgene@kernel.org>
> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Acked-by: Shawn Guo <shawnguo@kernel.org>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Applied to next/cleanup. Thanks!
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-10-22 16:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-02 16:24 [PATCH] ARM: Remove open-coded version of IRQCHIP_DECLARE Marc Zyngier
2015-10-04 23:52 ` Krzysztof Kozlowski
2015-10-06 15:29 ` Marc Zyngier
2015-10-08 6:49 ` Shawn Guo
2015-10-12 19:07 ` Kukjin Kim
2015-10-12 20:47 ` Tony Lindgren
2015-10-13 14:15 ` Joel Porquet
-- strict thread matches above, loose matches on Subject: below --
2015-10-16 14:21 Marc Zyngier
2015-10-22 16:53 ` Olof Johansson
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).