| Message ID | 1436299411-12329-1-git-send-email-joel@porquet.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Krzysztof Kozlowski <k.kozlowski@samsung.com> [150707 16:49]: > On 08.07.2015 05:02, Joel Porquet wrote: > > The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it > > globally accessible. > > > > See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d > > ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). > > > > This patch adds inclusions of 'include/linux/irqchip.h' and replaces uses of > > macro OF_DECLARE_2 with IRQCHIP_DECLARE. > > > > Signed-off-by: Joel Porquet <joel@porquet.org> > > --- > > arch/arm/mach-exynos/suspend.c | 3 ++- > > arch/arm/mach-imx/gpc.c | 7 ++----- > > arch/arm/mach-omap2/omap-wakeupgen.c | 7 ++----- > > 3 files changed, 6 insertions(+), 11 deletions(-) > > > > For Exynos: > Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> For omap changes: Acked-by: Tony Lindgren <tony@atomide.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 07, 2015 at 04:02:53PM -0400, Joel Porquet wrote: > The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it > globally accessible. > > See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d > ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). > > This patch adds inclusions of 'include/linux/irqchip.h' and replaces uses of > macro OF_DECLARE_2 with IRQCHIP_DECLARE. > > Signed-off-by: Joel Porquet <joel@porquet.org> > --- ... > arch/arm/mach-imx/gpc.c | 7 ++----- Acked-by: Shawn Guo <shawnguo@kernel.org> How will this patch be sent to upstream? Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday, July 13, 2015 11:20:35 PM Shawn Guo wrote: > On Tue, Jul 07, 2015 at 04:02:53PM -0400, Joel Porquet wrote: > > The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it > > globally accessible. > > > > See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d > > ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). > > > > This patch adds inclusions of 'include/linux/irqchip.h' and replaces uses > > of macro OF_DECLARE_2 with IRQCHIP_DECLARE. > > > > Signed-off-by: Joel Porquet <joel@porquet.org> > > --- > > ... > > > arch/arm/mach-imx/gpc.c | 7 ++----- > > Acked-by: Shawn Guo <shawnguo@kernel.org> > > How will this patch be sent to upstream? If it's more convenient for the different maintainers affected by this patch, I can probably resubmit it into a series of patches that modify each file separately... Let me know quickly so we don't miss the merge window! Joël -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 04, 2015 at 04:54:21PM -0400, Joel Porquet wrote: > On Monday, July 13, 2015 11:20:35 PM Shawn Guo wrote: > > On Tue, Jul 07, 2015 at 04:02:53PM -0400, Joel Porquet wrote: > > > The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it > > > globally accessible. > > > > > > See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d > > > ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). > > > > > > This patch adds inclusions of 'include/linux/irqchip.h' and replaces uses > > > of macro OF_DECLARE_2 with IRQCHIP_DECLARE. > > > > > > Signed-off-by: Joel Porquet <joel@porquet.org> > > > --- > > > > ... > > > > > arch/arm/mach-imx/gpc.c | 7 ++----- > > > > Acked-by: Shawn Guo <shawnguo@kernel.org> > > > > How will this patch be sent to upstream? > > If it's more convenient for the different maintainers affected by this patch, > I can probably resubmit it into a series of patches that modify each file > separately... Let me know quickly so we don't miss the merge window! We had sent out the materials for this merge window. So if you have a path to upstream, you'd better send this patch through that. You've already got the ACKs from maintainers of affected platform. Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index f572219..78484ab 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> @@ -264,7 +265,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 80bad29..32c26f5 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> @@ -269,11 +270,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 8e52621..e6a889f 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,8 +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);
The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h', making it globally accessible. See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h"). This patch adds inclusions of 'include/linux/irqchip.h' and replaces uses of macro OF_DECLARE_2 with IRQCHIP_DECLARE. Signed-off-by: Joel Porquet <joel@porquet.org> --- arch/arm/mach-exynos/suspend.c | 3 ++- arch/arm/mach-imx/gpc.c | 7 ++----- arch/arm/mach-omap2/omap-wakeupgen.c | 7 ++----- 3 files changed, 6 insertions(+), 11 deletions(-)