diff mbox series

[v3] MIPS: loongson32: Remove dma.h and nand.h

Message ID 20230830133505.505597-1-keguang.zhang@gmail.com (mailing list archive)
State Accepted
Commit 595b2c5917d89f5aeeecb4c74e29c0ecfabdc7e9
Headers show
Series [v3] MIPS: loongson32: Remove dma.h and nand.h | expand

Commit Message

Keguang Zhang Aug. 30, 2023, 1:35 p.m. UTC 
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
V2 -> V3: Fix the build error
          Add Reviewed-by tag from Philippe Mathieu-Daudé
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 -------------------
 .../include/asm/mach-loongson32/platform.h    |  3 ---
 arch/mips/loongson32/common/platform.c        |  2 --
 arch/mips/loongson32/ls1b/board.c             |  2 --
 5 files changed, 54 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h
 delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h


base-commit: e7513eccb7d7f82e28f4730210b42da71edaa6a6

Comments

Philippe Mathieu-Daudé Aug. 30, 2023, 9:11 p.m. UTC | #1 
On 30/8/23 15:35, 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>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> V2 -> V3: Fix the build error
>            Add Reviewed-by tag from Philippe Mathieu-Daudé
> 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 -------------------
>   .../include/asm/mach-loongson32/platform.h    |  3 ---
>   arch/mips/loongson32/common/platform.c        |  2 --
>   arch/mips/loongson32/ls1b/board.c             |  2 --
>   5 files changed, 54 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/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
> index 2cdcfb5f6012..f74292b13bc3 100644
> --- a/arch/mips/include/asm/mach-loongson32/platform.h
> +++ b/arch/mips/include/asm/mach-loongson32/platform.h
> @@ -8,9 +8,6 @@
>   
>   #include <linux/platform_device.h>
>   
> -#include <dma.h>
> -#include <nand.h>

Doh I missed that one in v2 :/

Thanks, R-b stands.
Thomas Bogendoerfer Oct. 6, 2023, 8:21 a.m. UTC | #2 
On Wed, Aug 30, 2023 at 09:35:05PM +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>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> V2 -> V3: Fix the build error
>           Add Reviewed-by tag from Philippe Mathieu-Daudé
> 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 -------------------
>  .../include/asm/mach-loongson32/platform.h    |  3 ---
>  arch/mips/loongson32/common/platform.c        |  2 --
>  arch/mips/loongson32/ls1b/board.c             |  2 --
>  5 files changed, 54 deletions(-)
>  delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h
>  delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h

applied to mips-next.

Thomas.
diff mbox series

Patch

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/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
index 2cdcfb5f6012..f74292b13bc3 100644
--- a/arch/mips/include/asm/mach-loongson32/platform.h
+++ b/arch/mips/include/asm/mach-loongson32/platform.h
@@ -8,9 +8,6 @@ 
 
 #include <linux/platform_device.h>
 
-#include <dma.h>
-#include <nand.h>
-
 extern struct platform_device ls1x_uart_pdev;
 extern struct platform_device ls1x_eth0_pdev;
 extern struct platform_device ls1x_eth1_pdev;
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 = {