Linux-MIPS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h>
@ 2020-07-26 16:58 Paul Cercueil
  2020-07-26 16:58 ` [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option Paul Cercueil
  2020-07-28  8:30 ` [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Thomas Bogendoerfer
  0 siblings, 2 replies; 4+ messages in thread
From: Paul Cercueil @ 2020-07-26 16:58 UTC (permalink / raw)
  To: Thomas Bogendoerfer
  Cc: Arnd Bergmann, od, linux-mips, linux-kernel, Paul Cercueil

Since commit 3a77e0d75eed ("MIPS: ath79: drop machfiles"), this header
is not used anymore.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 arch/mips/ath79/setup.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 4b7c066ac88e..7e7bf9c2ad26 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -23,7 +23,6 @@
 #include <asm/idle.h>
 #include <asm/time.h>		/* for mips_hpt_frequency */
 #include <asm/reboot.h>		/* for _machine_{restart,halt} */
-#include <asm/mips_machine.h>
 #include <asm/prom.h>
 #include <asm/fw/fw.h>
 
-- 
2.27.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option
  2020-07-26 16:58 [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Paul Cercueil
@ 2020-07-26 16:58 ` Paul Cercueil
  2020-07-28  8:30   ` Thomas Bogendoerfer
  2020-07-28  8:30 ` [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Thomas Bogendoerfer
  1 sibling, 1 reply; 4+ messages in thread
From: Paul Cercueil @ 2020-07-26 16:58 UTC (permalink / raw)
  To: Thomas Bogendoerfer
  Cc: Arnd Bergmann, od, linux-mips, linux-kernel, Paul Cercueil

The CONFIG_MIPS_MACHINE option is dead code that hasn't been used in
years. The Kconfig option is not selected anywhere, and the
<asm/mips_machine.h> is not included anywhere either.

To make things worse, for years it co-existed with a separate MIPS
machine implementation as <asm/machine.h>. The two defined the
'mips_machine' structure with different fields, and the 'MIPS_MACHINE'
macro with different parameters. The two used the same memory area
(defined by the linker script) to store data, and you could totally use
the two at the same time for all kinds of funny results.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 arch/mips/Kconfig                    |  3 --
 arch/mips/include/asm/mips_machine.h | 46 ---------------------
 arch/mips/kernel/Makefile            |  1 -
 arch/mips/kernel/mips_machine.c      | 62 ----------------------------
 4 files changed, 112 deletions(-)
 delete mode 100644 arch/mips/include/asm/mips_machine.h
 delete mode 100644 arch/mips/kernel/mips_machine.c

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6fee1a133e9d..d3d4f4e093f0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1169,9 +1169,6 @@ config MIPS_MSC
 config SYNC_R4K
 	bool
 
-config MIPS_MACHINE
-	def_bool n
-
 config NO_IOPORT_MAP
 	def_bool n
 
diff --git a/arch/mips/include/asm/mips_machine.h b/arch/mips/include/asm/mips_machine.h
deleted file mode 100644
index 4efecb70c24e..000000000000
--- a/arch/mips/include/asm/mips_machine.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
- */
-
-#ifndef __ASM_MIPS_MACHINE_H
-#define __ASM_MIPS_MACHINE_H
-
-#include <linux/init.h>
-#include <linux/stddef.h>
-
-#include <asm/bootinfo.h>
-
-struct mips_machine {
-	unsigned long		mach_type;
-	const char		*mach_id;
-	const char		*mach_name;
-	void			(*mach_setup)(void);
-};
-
-#define MIPS_MACHINE(_type, _id, _name, _setup)			\
-static const char machine_name_##_type[] __initconst		\
-			__aligned(1) = _name;			\
-static const char machine_id_##_type[] __initconst		\
-			__aligned(1) = _id;			\
-static struct mips_machine machine_##_type			\
-		__used __section(.mips.machines.init) =		\
-{								\
-	.mach_type	= _type,				\
-	.mach_id	= machine_id_##_type,			\
-	.mach_name	= machine_name_##_type,			\
-	.mach_setup	= _setup,				\
-};
-
-extern long __mips_machines_start;
-extern long __mips_machines_end;
-
-#ifdef CONFIG_MIPS_MACHINE
-int  mips_machtype_setup(char *id) __init;
-void mips_machine_setup(void) __init;
-#else
-static inline int mips_machtype_setup(char *id) { return 1; }
-static inline void mips_machine_setup(void) { }
-#endif /* CONFIG_MIPS_MACHINE */
-
-#endif /* __ASM_MIPS_MACHINE_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 8c7a043295ed..13a26d254829 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -93,7 +93,6 @@ obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_EARLY_PRINTK_8250)	+= early_printk_8250.o
 obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o
-obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
 obj-$(CONFIG_MIPSR2_TO_R6_EMULATOR)	+= mips-r2-to-r6-emul.o
 
 CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -x c /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c
deleted file mode 100644
index 4c509641723c..000000000000
--- a/arch/mips/kernel/mips_machine.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
- */
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include <asm/mips_machine.h>
-#include <asm/prom.h>
-
-static struct mips_machine *mips_machine __initdata;
-
-#define for_each_machine(mach) \
-	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
-	     (mach) && \
-	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
-	     (mach)++)
-
-__init int mips_machtype_setup(char *id)
-{
-	struct mips_machine *mach;
-
-	for_each_machine(mach) {
-		if (mach->mach_id == NULL)
-			continue;
-
-		if (strcmp(mach->mach_id, id) == 0) {
-			mips_machtype = mach->mach_type;
-			return 0;
-		}
-	}
-
-	pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
-	pr_err("%-24s %s\n", "id", "name");
-	for_each_machine(mach)
-		pr_err("%-24s %s\n", mach->mach_id, mach->mach_name);
-
-	return 1;
-}
-
-__setup("machtype=", mips_machtype_setup);
-
-__init void mips_machine_setup(void)
-{
-	struct mips_machine *mach;
-
-	for_each_machine(mach) {
-		if (mips_machtype == mach->mach_type) {
-			mips_machine = mach;
-			break;
-		}
-	}
-
-	if (!mips_machine)
-		return;
-
-	mips_set_machine_name(mips_machine->mach_name);
-
-	if (mips_machine->mach_setup)
-		mips_machine->mach_setup();
-}
-- 
2.27.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h>
  2020-07-26 16:58 [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Paul Cercueil
  2020-07-26 16:58 ` [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option Paul Cercueil
@ 2020-07-28  8:30 ` Thomas Bogendoerfer
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Bogendoerfer @ 2020-07-28  8:30 UTC (permalink / raw)
  To: Paul Cercueil; +Cc: Arnd Bergmann, od, linux-mips, linux-kernel

On Sun, Jul 26, 2020 at 06:58:27PM +0200, Paul Cercueil wrote:
> Since commit 3a77e0d75eed ("MIPS: ath79: drop machfiles"), this header
> is not used anymore.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
>  arch/mips/ath79/setup.c | 1 -
>  1 file changed, 1 deletion(-)

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 ]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option
  2020-07-26 16:58 ` [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option Paul Cercueil
@ 2020-07-28  8:30   ` Thomas Bogendoerfer
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Bogendoerfer @ 2020-07-28  8:30 UTC (permalink / raw)
  To: Paul Cercueil; +Cc: Arnd Bergmann, od, linux-mips, linux-kernel

On Sun, Jul 26, 2020 at 06:58:28PM +0200, Paul Cercueil wrote:
> The CONFIG_MIPS_MACHINE option is dead code that hasn't been used in
> years. The Kconfig option is not selected anywhere, and the
> <asm/mips_machine.h> is not included anywhere either.
> 
> To make things worse, for years it co-existed with a separate MIPS
> machine implementation as <asm/machine.h>. The two defined the
> 'mips_machine' structure with different fields, and the 'MIPS_MACHINE'
> macro with different parameters. The two used the same memory area
> (defined by the linker script) to store data, and you could totally use
> the two at the same time for all kinds of funny results.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
>  arch/mips/Kconfig                    |  3 --
>  arch/mips/include/asm/mips_machine.h | 46 ---------------------
>  arch/mips/kernel/Makefile            |  1 -
>  arch/mips/kernel/mips_machine.c      | 62 ----------------------------
>  4 files changed, 112 deletions(-)
>  delete mode 100644 arch/mips/include/asm/mips_machine.h
>  delete mode 100644 arch/mips/kernel/mips_machine.c

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 ]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-26 16:58 [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Paul Cercueil
2020-07-26 16:58 ` [PATCH 2/2] MIPS: Remove legacy MIPS_MACHINE option Paul Cercueil
2020-07-28  8:30   ` Thomas Bogendoerfer
2020-07-28  8:30 ` [PATCH 1/2] MIPS: ath79: Remove unused include <asm/mips_machine.h> Thomas Bogendoerfer

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org
	public-inbox-index linux-mips

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git