2015-07-07 21:52:50

by Joel Porquet

Subject: [PATCH 3/5] arc:irqchip: prepare for drivers/irqchip/irqchip.h removal

The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.

See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d
("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h").

This patch removes the inclusions of private header 'drivers/irqchip/irqchip.h'
and if necessary replaces them with inclusions of 'include/linux/irqchip.h'.

Signed-off-by: Joel Porquet <[email protected]>
---
arch/arc/kernel/intc-arcv2.c | 1 -
arch/arc/kernel/intc-compact.c | 1 -
arch/arc/kernel/mcip.c | 1 -
3 files changed, 3 deletions(-)

diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c
index 6208c63..26c1568 100644
--- a/arch/arc/kernel/intc-arcv2.c
+++ b/arch/arc/kernel/intc-arcv2.c
@@ -12,7 +12,6 @@
#include <linux/of.h>
#include <linux/irqdomain.h>
#include <linux/irqchip.h>
-#include "../../drivers/irqchip/irqchip.h"
#include <asm/irq.h>

/*
diff --git a/arch/arc/kernel/intc-compact.c b/arch/arc/kernel/intc-compact.c
index fcdddb6..039fac3 100644
--- a/arch/arc/kernel/intc-compact.c
+++ b/arch/arc/kernel/intc-compact.c
@@ -12,7 +12,6 @@
#include <linux/of.h>
#include <linux/irqdomain.h>
#include <linux/irqchip.h>
-#include "../../drivers/irqchip/irqchip.h"
#include <asm/irq.h>

/*
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index 30284e8..2673975 100644
--- a/arch/arc/kernel/mcip.c
+++ b/arch/arc/kernel/mcip.c
@@ -175,7 +175,6 @@ void mcip_init_early_smp(void)
#include <linux/irqchip.h>
#include <linux/of.h>
#include <linux/of_irq.h>
-#include "../../drivers/irqchip/irqchip.h"

/*
* Set the DEST for @cmn_irq to @cpu_mask (1 bit per core)
--
2.4.5

2015-07-08 01:59:08

by Vineet Gupta

Subject: Re: [PATCH 3/5] arc:irqchip: prepare for drivers/irqchip/irqchip.h removal

On Wednesday 08 July 2015 02:45 AM, Jo?l Porquet wrote:

The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.

See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d
("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h").

This patch removes the inclusions of private header 'drivers/irqchip/irqchip.h'
and if necessary replaces them with inclusions of 'include/linux/irqchip.h'.

Signed-off-by: Joel Porquet <[email protected]><mailto:[email protected]>

Acked-by: Vineet Gupta <[email protected]<mailto:[email protected]>>

Joel, Thomas : Do you want me to pick this one up ?

Thx,
-Vineet

2015-07-08 07:46:45

by Thomas Gleixner

Subject: Re: [PATCH 3/5] arc:irqchip: prepare for drivers/irqchip/irqchip.h removal

On Wed, 8 Jul 2015, Vineet Gupta wrote:
> On Wednesday 08 July 2015 02:45 AM, Jo?l Porquet wrote:
>
> The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.
>
> See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d
> ("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h").
>
> This patch removes the inclusions of private header 'drivers/irqchip/irqchip.h'
> and if necessary replaces them with inclusions of 'include/linux/irqchip.h'.
>
> Signed-off-by: Joel Porquet <[email protected]><mailto:[email protected]>
>
> Acked-by: Vineet Gupta <[email protected]<mailto:[email protected]>>
>
> Joel, Thomas : Do you want me to pick this one up ?

Yes.

Btw, feel glad, that Joel figured this include '../../....' crap out
and not me. I certainly wouldn't have written a purely technical
changelog. include '../../....' is wrong in 99% of the cases.

Thanks,

tglx