| Message ID | 20210204135902.10361-1-alobakin@pm.me (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c87bc737220adc4627f191a5e4ed5068aabc24a1 |
| Headers | show |
| Series | [mips-next] MIPS: pistachio: remove obsolete include/asm/mach-pistachio | expand |
On Thu, Feb 04, 2021 at 01:59:29PM +0000, Alexander Lobakin wrote: > Since commit 02bd530f888c ("MIPS: generic: Increase NR_IRQS to 256") > include/asm/mach-pistachio/irq.h just does nothing. > Remove the file along with mach-pistachio folder and include compiler > directive. > > Signed-off-by: Alexander Lobakin <alobakin@pm.me> > --- > MAINTAINERS | 1 - > arch/mips/include/asm/mach-pistachio/irq.h | 15 --------------- > arch/mips/pistachio/Platform | 2 -- > 3 files changed, 18 deletions(-) > delete mode 100644 arch/mips/include/asm/mach-pistachio/irq.h applied to mips-next. Thomas.
diff --git a/MAINTAINERS b/MAINTAINERS index 6add29cb2060..3e58787907d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14099,7 +14099,6 @@ L: linux-mips@vger.kernel.org S: Odd Fixes F: arch/mips/boot/dts/img/pistachio* F: arch/mips/configs/pistachio*_defconfig -F: arch/mips/include/asm/mach-pistachio/ F: arch/mips/pistachio/ PKTCDVD DRIVER diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/include/asm/mach-pistachio/irq.h deleted file mode 100644 index 74ac016503ad..000000000000 --- a/arch/mips/include/asm/mach-pistachio/irq.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Pistachio IRQ setup - * - * Copyright (C) 2014 Google, Inc. - */ - -#ifndef __ASM_MACH_PISTACHIO_IRQ_H -#define __ASM_MACH_PISTACHIO_IRQ_H - -#define NR_IRQS 256 - -#include <asm/mach-generic/irq.h> - -#endif /* __ASM_MACH_PISTACHIO_IRQ_H */ diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform index f73a1a929965..c59de86dbddf 100644 --- a/arch/mips/pistachio/Platform +++ b/arch/mips/pistachio/Platform @@ -1,8 +1,6 @@ # # IMG Pistachio SoC # -cflags-$(CONFIG_MACH_PISTACHIO) += \ - -I$(srctree)/arch/mips/include/asm/mach-pistachio load-$(CONFIG_MACH_PISTACHIO) += 0xffffffff80400000 zload-$(CONFIG_MACH_PISTACHIO) += 0xffffffff81000000 all-$(CONFIG_MACH_PISTACHIO) := uImage.gz
Since commit 02bd530f888c ("MIPS: generic: Increase NR_IRQS to 256") include/asm/mach-pistachio/irq.h just does nothing. Remove the file along with mach-pistachio folder and include compiler directive. Signed-off-by: Alexander Lobakin <alobakin@pm.me> --- MAINTAINERS | 1 - arch/mips/include/asm/mach-pistachio/irq.h | 15 --------------- arch/mips/pistachio/Platform | 2 -- 3 files changed, 18 deletions(-) delete mode 100644 arch/mips/include/asm/mach-pistachio/irq.h