[irqchip: irq/irqchip-next] Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

[irqchip: irq/irqchip-next] Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

[irqchip-bot for Marc Zyngier]

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     d93c22199966696cfb76c6942797de2fbb22da24
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/d93c22199966696cfb76c6942797de2fbb22da24
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Wed, 21 Jun 2023 13:46:25 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Wed, 21 Jun 2023 13:50:53 +01:00

Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

This reverts commit 5b7e5676209120814dbb9fec8bc3769f0f7a7958.

Although including linux/irqchip/mxs.h is technically correct,
this clashes with the parallel removal of this include file
with 32bit ARM modernizing the low level irq handling as part of
5bb578a0c1b8 ("ARM: 9298/1: Drop custom mdesc->handle_irq()").

As such, this patch is not only unnecessary, it also breaks
compilation in -next. Revert it.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Shawn Guo <shawnguo@kernel.org>
---
 drivers/irqchip/irq-mxs.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c
index b3b1fba..55cb6b5 100644
--- a/drivers/irqchip/irq-mxs.c
+++ b/drivers/irqchip/irq-mxs.c
@@ -9,7 +9,6 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/irqchip.h>
-#include <linux/irqchip/mxs.h>
 #include <linux/irqdomain.h>
 #include <linux/io.h>
 #include <linux/of.h>

Re: [irqchip: irq/irqchip-next] Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

[Arnd Bergmann]

On Wed, Jun 21, 2023, at 14:57, irqchip-bot for Marc Zyngier wrote:
> The following commit has been merged into the irq/irqchip-next branch 
> of irqchip:
>
> Commit-ID:     d93c22199966696cfb76c6942797de2fbb22da24
> Gitweb:        
> https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/d93c22199966696cfb76c6942797de2fbb22da24
> Author:        Marc Zyngier <maz@kernel.org>
> AuthorDate:    Wed, 21 Jun 2023 13:46:25 +01:00
> Committer:     Marc Zyngier <maz@kernel.org>
> CommitterDate: Wed, 21 Jun 2023 13:50:53 +01:00
>
> Revert "irqchip/mxs: Include linux/irqchip/mxs.h"
>
> This reverts commit 5b7e5676209120814dbb9fec8bc3769f0f7a7958.
>
> Although including linux/irqchip/mxs.h is technically correct,
> this clashes with the parallel removal of this include file
> with 32bit ARM modernizing the low level irq handling as part of
> 5bb578a0c1b8 ("ARM: 9298/1: Drop custom mdesc->handle_irq()").
>
> As such, this patch is not only unnecessary, it also breaks
> compilation in -next. Revert it.
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Shawn Guo <shawnguo@kernel.org>

Thanks! I had prepared the same patch but not yet sent it as I
was still debugging some unrelated issues. Once 5bb578a0c1b8
ends up in mainline, we can get back to fixing the warning
by marking the handler as 'static'.

     Arnd