Skip to contentSkip to conversation

MIPS: loongson32: Remove dma.h and nand.h

PATCH Applied Keguang Zhang 3 participants 3 messages Aug 30, 2023 – Oct 6, 2023

Subsystems (2)
lore
Share & tools
lore

Keguang Zhang

author maintainer
#0 lore raw

PATCH v3 1/1 MIPS: loongson32: Remove dma.h and nand.h

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.

---
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
arch/mips/include/asm/mach-loongson32/dma.h deleted +0 -21
deleted file mode 100644
index e917b3ccb2c2..000000000000
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (c) 2015 Zhang, Keguang <[email protected]>
- *
- * 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 */
arch/mips/include/asm/mach-loongson32/nand.h deleted +0 -26
deleted file mode 100644
index aaf5ed19d78d..000000000000
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (c) 2015 Zhang, Keguang <[email protected]>
- *
- * 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 */
arch/mips/include/asm/mach-loongson32/platform.h +0 -3
index 2cdcfb5f6012..f74292b13bc3 100644
@@ -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;
arch/mips/loongson32/common/platform.c +0 -2
index 8075590a9f83..623eb4bc7b41 100644
@@ -15,8 +15,6 @@
 
 #include <platform.h>
 #include <loongson1.h>
-#include <dma.h>
-#include <nand.h>
 
 /* 8250/16550 compatible UART */
 #define LS1X_UART(_id)						\
arch/mips/loongson32/ls1b/board.c +0 -2
index fed8d432ef20..fe115bdcb22c 100644
@@ -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: e7513eccb7d7f82e28f4730210b42da71edaa6a6

Signature · 1 line
2.39.2
#1 lore raw
Quoted 28 lines · 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.

---
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

arch/mips/include/asm/mach-loongson32/platform.h +0 -0
index 2cdcfb5f6012..f74292b13bc3 100644

arch/mips/include/asm/mach-loongson32/platform.h line 12

Quoted 5 lines
arch/mips/include/asm/mach-loongson32/platform.h +0 -2
@@ -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.

maintainer Applied
#2 lore raw
In reply to Keguang Zhang
Quoted 12 lines · 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.

---
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

Quoted 9 lines
---
 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.

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