[PATCH 0/7] Remove orphan declarations for mips

[PATCH 0/7] Remove orphan declarations for mips

[Gaosheng Cui]

This series contains a few cleanup patches, to remove unused
declarations which have been removed. Thanks!

Gaosheng Cui (7):
  MIPS: Loongson2ef: remove orphan sbx00_acpi_init() declaration
  MIPS: Octeon: remove orphan octeon_swiotlb declaration
  MIPS: Octeon: remove orphan cvmx_fpa_setup_pool() declaration
  MIPS: Octeon: remove orphan octeon_hal_setup_reserved32() declaration
  MIPS: IRQ: remove orphan declarations from arch/mips/include/asm/irq.h
  MIPS: remove orphan sni_cpu_time_init() declaration
  MIPS: AR7: remove orphan declarations from
    arch/mips/include/asm/mach-ar7/ar7.h

 arch/mips/include/asm/irq.h               |  2 --
 arch/mips/include/asm/mach-ar7/ar7.h      |  2 --
 arch/mips/include/asm/octeon/cvmx-fpa.h   | 20 --------------------
 arch/mips/include/asm/octeon/octeon.h     |  1 -
 arch/mips/include/asm/octeon/pci-octeon.h |  2 --
 arch/mips/include/asm/sni.h               |  3 ---
 arch/mips/loongson2ef/common/pci.c        |  2 --
 7 files changed, 32 deletions(-)

-- 
2.25.1

[PATCH 1/7] MIPS: Loongson2ef: remove orphan sbx00_acpi_init() declaration

[Gaosheng Cui]

All uses of sbx00_acpi_init() in the "pci.c" file were removed by
commit 5831fdb099dd ("MIPS: Loongson2ef: clean up loongson64
related code"), so remove the orphan declaration, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/loongson2ef/common/pci.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/mips/loongson2ef/common/pci.c b/arch/mips/loongson2ef/common/pci.c
index 200916925e95..7d9ea51e8c01 100644
--- a/arch/mips/loongson2ef/common/pci.c
+++ b/arch/mips/loongson2ef/common/pci.c
@@ -73,8 +73,6 @@ static void __init setup_pcimap(void)
 #endif
 }
 
-extern int sbx00_acpi_init(void);
-
 static int __init pcibios_init(void)
 {
 	setup_pcimap();
-- 
2.25.1

[PATCH 2/7] MIPS: Octeon: remove orphan octeon_swiotlb declaration

[Gaosheng Cui]

All uses of octeon_swiotlb were removed by
commit f39f8d0eb081 ("MIPS/octeon: use swiotlb_init instead
of open coding it"), so remove the orphan declaration, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/octeon/pci-octeon.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/mips/include/asm/octeon/pci-octeon.h b/arch/mips/include/asm/octeon/pci-octeon.h
index b12d9a3fbfb6..2f46f6c6e3d0 100644
--- a/arch/mips/include/asm/octeon/pci-octeon.h
+++ b/arch/mips/include/asm/octeon/pci-octeon.h
@@ -64,6 +64,4 @@ enum octeon_dma_bar_type {
 extern enum octeon_dma_bar_type octeon_dma_bar_type;
 
 void octeon_pci_dma_init(void);
-extern char *octeon_swiotlb;
-
 #endif
-- 
2.25.1

[PATCH 3/7] MIPS: Octeon: remove orphan cvmx_fpa_setup_pool() declaration

[Gaosheng Cui]

All uses of cvmx_fpa_setup_pool() were removed by
commit a03822ea5df6 ("MIPS: OCTEON: Remove some unused files."),
so remove the orphan declaration, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/octeon/cvmx-fpa.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/arch/mips/include/asm/octeon/cvmx-fpa.h b/arch/mips/include/asm/octeon/cvmx-fpa.h
index 29ae63606ab4..f6dfcca97f19 100644
--- a/arch/mips/include/asm/octeon/cvmx-fpa.h
+++ b/arch/mips/include/asm/octeon/cvmx-fpa.h
@@ -263,26 +263,6 @@ static inline void cvmx_fpa_free(void *ptr, uint64_t pool,
 	cvmx_write_io(newptr.u64, num_cache_lines);
 }
 
-/**
- * Setup a FPA pool to control a new block of memory.
- * This can only be called once per pool. Make sure proper
- * locking enforces this.
- *
- * @pool:	Pool to initialize
- *		     0 <= pool < 8
- * @name:	Constant character string to name this pool.
- *		     String is not copied.
- * @buffer:	Pointer to the block of memory to use. This must be
- *		     accessible by all processors and external hardware.
- * @block_size: Size for each block controlled by the FPA
- * @num_blocks: Number of blocks
- *
- * Returns 0 on Success,
- *	   -1 on failure
- */
-extern int cvmx_fpa_setup_pool(uint64_t pool, const char *name, void *buffer,
-			       uint64_t block_size, uint64_t num_blocks);
-
 /**
  * Shutdown a Memory pool and validate that it had all of
  * the buffers originally placed in it. This should only be
-- 
2.25.1

[PATCH 4/7] MIPS: Octeon: remove orphan octeon_hal_setup_reserved32() declaration

[Gaosheng Cui]

All uses of octeon_hal_setup_reserved32() were removed by
commit 1ef2887030db ("MIPS: Octeon: Remove vestiges of
CONFIG_CAVIUM_RESERVE32_USE_WIRED_TLB"), so remove the
orphan declaration, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/octeon/octeon.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index 7e714aefc76d..5c1d726c702f 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -43,7 +43,6 @@ extern int octeon_get_southbridge_interrupt(void);
 extern int octeon_get_boot_coremask(void);
 extern int octeon_get_boot_num_arguments(void);
 extern const char *octeon_get_boot_argument(int arg);
-extern void octeon_hal_setup_reserved32(void);
 extern void octeon_user_io_init(void);
 
 extern void octeon_init_cvmcount(void);
-- 
2.25.1

[PATCH 5/7] MIPS: IRQ: remove orphan declarations from arch/mips/include/asm/irq.h

[Gaosheng Cui]

All uses of free_irqno() and alloc_legacy_irqno() were removed
by commit 69a07a41d908 ("MIPS: SGI-IP27: rework HUB interrupts"),
so remove the orphan declarations, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/irq.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 57561e0e6e8d..76941ae572b2 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -64,8 +64,6 @@ extern void arch_init_irq(void);
 extern void spurious_interrupt(void);
 
 extern int allocate_irqno(void);
-extern void alloc_legacy_irqno(void);
-extern void free_irqno(unsigned int irq);
 
 /*
  * Before R2 the timer and performance counter interrupts were both fixed to
-- 
2.25.1

[PATCH 6/7] MIPS: remove orphan sni_cpu_time_init() declaration

[Gaosheng Cui]

All uses of sni_cpu_time_init() were removed by
commit 4b550488f894 ("[MIPS] Deforest the function pointer jungle
in the time code."), so remove the orphan declaration, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/sni.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/mips/include/asm/sni.h b/arch/mips/include/asm/sni.h
index 7dfa297ce597..7fb6656a6bfd 100644
--- a/arch/mips/include/asm/sni.h
+++ b/arch/mips/include/asm/sni.h
@@ -226,9 +226,6 @@ extern void sni_pcit_cplus_irq_init(void);
 extern void sni_rm200_irq_init(void);
 extern void sni_pcimt_irq_init(void);
 
-/* timer inits */
-extern void sni_cpu_time_init(void);
-
 /* eisa init for RM200/400 */
 #ifdef CONFIG_EISA
 extern int sni_eisa_root_init(void);
-- 
2.25.1

[PATCH 7/7] MIPS: AR7: remove orphan declarations from arch/mips/include/asm/mach-ar7/ar7.h

[Gaosheng Cui]

All uses of ar7_cpu_clock, ar7_bus_clock and ar7_dsp_clock were
removed by commit 780019ddf02f ("MIPS: AR7: Implement clock API"),
so remove the orphan declarations, too.

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
 arch/mips/include/asm/mach-ar7/ar7.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h
index cbe75ade3277..1e8621a6afa3 100644
--- a/arch/mips/include/asm/mach-ar7/ar7.h
+++ b/arch/mips/include/asm/mach-ar7/ar7.h
@@ -104,8 +104,6 @@ struct plat_dsl_data {
 	int reset_bit_sar;
 };
 
-extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock;
-
 static inline int ar7_is_titan(void)
 {
 	return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
-- 
2.25.1

Re: [PATCH 0/7] Remove orphan declarations for mips

[Thomas Bogendoerfer]

On Thu, Sep 15, 2022 at 09:21:50PM +0800, Gaosheng Cui wrote:
> This series contains a few cleanup patches, to remove unused
> declarations which have been removed. Thanks!
> 
> Gaosheng Cui (7):
>   MIPS: Loongson2ef: remove orphan sbx00_acpi_init() declaration
>   MIPS: Octeon: remove orphan octeon_swiotlb declaration
>   MIPS: Octeon: remove orphan cvmx_fpa_setup_pool() declaration
>   MIPS: Octeon: remove orphan octeon_hal_setup_reserved32() declaration
>   MIPS: IRQ: remove orphan declarations from arch/mips/include/asm/irq.h
>   MIPS: remove orphan sni_cpu_time_init() declaration
>   MIPS: AR7: remove orphan declarations from
>     arch/mips/include/asm/mach-ar7/ar7.h
> 
>  arch/mips/include/asm/irq.h               |  2 --
>  arch/mips/include/asm/mach-ar7/ar7.h      |  2 --
>  arch/mips/include/asm/octeon/cvmx-fpa.h   | 20 --------------------
>  arch/mips/include/asm/octeon/octeon.h     |  1 -
>  arch/mips/include/asm/octeon/pci-octeon.h |  2 --
>  arch/mips/include/asm/sni.h               |  3 ---
>  arch/mips/loongson2ef/common/pci.c        |  2 --
>  7 files changed, 32 deletions(-)

series applied to mips-next.

Thomas.

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