[PATCH v2] MIPS: loongson32: Remove dma.h and nand.h

[PATCH v2] MIPS: loongson32: Remove dma.h and nand.h

[Keguang Zhang]

Since commit 7b3415f581c7 ("MIPS: Loongson32: Remove
unused platform devices"), struct plat_ls1x_dma and plat_ls1x_nand
are unused. Then, dma.h and nand.h are useless.
Therefore, remove these useless header files.

Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
---
V1 -> V2: Remove include of dma.h and nand.h
          Update the commit message

 arch/mips/include/asm/mach-loongson32/dma.h  | 21 ----------------
 arch/mips/include/asm/mach-loongson32/nand.h | 26 --------------------
 arch/mips/loongson32/common/platform.c       |  2 --
 arch/mips/loongson32/ls1b/board.c            |  2 --
 4 files changed, 51 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h
 delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h

diff --git a/arch/mips/include/asm/mach-loongson32/dma.h b/arch/mips/include/asm/mach-loongson32/dma.h
deleted file mode 100644
index e917b3ccb2c2..000000000000
--- a/arch/mips/include/asm/mach-loongson32/dma.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (c) 2015 Zhang, Keguang <keguang.zhang@gmail.com>
- *
- * Loongson 1 NAND platform support.
- */
-
-#ifndef __ASM_MACH_LOONGSON32_DMA_H
-#define __ASM_MACH_LOONGSON32_DMA_H
-
-#define LS1X_DMA_CHANNEL0	0
-#define LS1X_DMA_CHANNEL1	1
-#define LS1X_DMA_CHANNEL2	2
-
-struct plat_ls1x_dma {
-	int nr_channels;
-};
-
-extern struct plat_ls1x_dma ls1b_dma_pdata;
-
-#endif /* __ASM_MACH_LOONGSON32_DMA_H */
diff --git a/arch/mips/include/asm/mach-loongson32/nand.h b/arch/mips/include/asm/mach-loongson32/nand.h
deleted file mode 100644
index aaf5ed19d78d..000000000000
--- a/arch/mips/include/asm/mach-loongson32/nand.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (c) 2015 Zhang, Keguang <keguang.zhang@gmail.com>
- *
- * Loongson 1 NAND platform support.
- */
-
-#ifndef __ASM_MACH_LOONGSON32_NAND_H
-#define __ASM_MACH_LOONGSON32_NAND_H
-
-#include <linux/dmaengine.h>
-#include <linux/mtd/partitions.h>
-
-struct plat_ls1x_nand {
-	struct mtd_partition *parts;
-	unsigned int nr_parts;
-
-	int hold_cycle;
-	int wait_cycle;
-};
-
-extern struct plat_ls1x_nand ls1b_nand_pdata;
-
-bool ls1x_dma_filter_fn(struct dma_chan *chan, void *param);
-
-#endif /* __ASM_MACH_LOONGSON32_NAND_H */
diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c
index 8075590a9f83..623eb4bc7b41 100644
--- a/arch/mips/loongson32/common/platform.c
+++ b/arch/mips/loongson32/common/platform.c
@@ -15,8 +15,6 @@
 
 #include <platform.h>
 #include <loongson1.h>
-#include <dma.h>
-#include <nand.h>
 
 /* 8250/16550 compatible UART */
 #define LS1X_UART(_id)						\
diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c
index fed8d432ef20..fe115bdcb22c 100644
--- a/arch/mips/loongson32/ls1b/board.c
+++ b/arch/mips/loongson32/ls1b/board.c
@@ -8,8 +8,6 @@
 #include <linux/sizes.h>
 
 #include <loongson1.h>
-#include <dma.h>
-#include <nand.h>
 #include <platform.h>
 
 static const struct gpio_led ls1x_gpio_leds[] __initconst = {

base-commit: be87eab1320e25c7d43cec7ee59bc607050abe85
-- 
2.39.2

Re: [PATCH v2] MIPS: loongson32: Remove dma.h and nand.h

[Philippe Mathieu-Daudé]

On 28/8/23 15:47, Keguang Zhang wrote:
> Since commit 7b3415f581c7 ("MIPS: Loongson32: Remove
> unused platform devices"), struct plat_ls1x_dma and plat_ls1x_nand
> are unused. Then, dma.h and nand.h are useless.
> Therefore, remove these useless header files.
> 
> Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> ---
> V1 -> V2: Remove include of dma.h and nand.h
>            Update the commit message
> 
>   arch/mips/include/asm/mach-loongson32/dma.h  | 21 ----------------
>   arch/mips/include/asm/mach-loongson32/nand.h | 26 --------------------
>   arch/mips/loongson32/common/platform.c       |  2 --
>   arch/mips/loongson32/ls1b/board.c            |  2 --
>   4 files changed, 51 deletions(-)
>   delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h
>   delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v2] MIPS: loongson32: Remove dma.h and nand.h

[Thomas Bogendoerfer]

On Mon, Aug 28, 2023 at 09:47:25PM +0800, Keguang Zhang wrote:
> Since commit 7b3415f581c7 ("MIPS: Loongson32: Remove
> unused platform devices"), struct plat_ls1x_dma and plat_ls1x_nand
> are unused. Then, dma.h and nand.h are useless.
> Therefore, remove these useless header files.
> 
> Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> ---
> V1 -> V2: Remove include of dma.h and nand.h
>           Update the commit message

this still doesn't compile, when applied to mips-next. Can you
please check, that it compiles before sending ? Thank you.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

Re: [PATCH v2] MIPS: loongson32: Remove dma.h and nand.h

[Keguang Zhang]

On Tue, Aug 29, 2023 at 11:21 PM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> wrote:
>
> On Mon, Aug 28, 2023 at 09:47:25PM +0800, Keguang Zhang wrote:
> > Since commit 7b3415f581c7 ("MIPS: Loongson32: Remove
> > unused platform devices"), struct plat_ls1x_dma and plat_ls1x_nand
> > are unused. Then, dma.h and nand.h are useless.
> > Therefore, remove these useless header files.
> >
> > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> > ---
> > V1 -> V2: Remove include of dma.h and nand.h
> >           Update the commit message
>
> this still doesn't compile, when applied to mips-next. Can you
> please check, that it compiles before sending ? Thank you.
>
Sorry! I will make sure that there will be no more build errors in the
next version.

> Thomas.
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea.                                                [ RFC1925, 2.3 ]



-- 
Best regards,

Keguang Zhang