Commit fd90410e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

vgacon, arch/*: remove unused screen_info definitions 



A number of architectures either kept the screen_info definition for
historical purposes as it used to be required by the generic VT code, or
they copied it from another architecture in order to build the VGA console
driver in an allmodconfig build. The mips definition is used by some
platforms, but the initialization on jazz is not needed.

Now that vgacon no longer builds on these architectures, remove the
stale definitions and initializations.

Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
Acked-by: default avatarGuo Ren <guoren@kernel.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231009211845.3136536-5-arnd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4293b092

arch/csky/kernel/setup.c

+0 −12
Original line number Diff line number Diff line
@@ -8,22 +8,10 @@ 
#include <linux/of_fdt.h>

#include <linux/start_kernel.h>

#include <linux/dma-map-ops.h>

#include <linux/screen_info.h>

#include <asm/sections.h>

#include <asm/mmu_context.h>

#include <asm/pgalloc.h>



#ifdef CONFIG_DUMMY_CONSOLE

struct screen_info screen_info = {

	.orig_video_lines	= 30,

	.orig_video_cols	= 80,

	.orig_video_mode	= 0,

	.orig_video_ega_bx	= 0,

	.orig_video_isVGA	= 1,

	.orig_video_points	= 8

};

#endif



static void __init csky_memblock_init(void)

{

	unsigned long lowmem_size = PFN_DOWN(LOWMEM_LIMIT - PHYS_OFFSET_OFFSET);

arch/hexagon/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -17,5 +17,3 @@ obj-y += vm_vectors.o 
obj-$(CONFIG_HAS_DMA) += dma.o



obj-$(CONFIG_STACKTRACE) += stacktrace.o
 


obj-$(CONFIG_VGA_CONSOLE) += screen_info.o

arch/hexagon/kernel/screen_info.c

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
#include <linux/screen_info.h>



struct screen_info screen_info;

arch/mips/jazz/setup.c

+0 −9
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/console.h>

#include <linux/screen_info.h>

#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/dma-mapping.h>
@@ -76,14 +75,6 @@ void __init plat_mem_setup(void) 


	_machine_restart = jazz_machine_restart;



#ifdef CONFIG_VT

	screen_info = (struct screen_info) {

		.orig_video_cols	= 160,

		.orig_video_lines	= 64,

		.orig_video_points	= 16,

	};

#endif



	add_preferred_console("ttyS", 0, "9600");

}

arch/nios2/kernel/setup.c

+0 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/memblock.h>

#include <linux/initrd.h>

#include <linux/of_fdt.h>

#include <linux/screen_info.h>



#include <asm/mmu_context.h>

#include <asm/sections.h>
@@ -36,10 +35,6 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
					0, 0, 0, 0, 0, 0,

					0};



#ifdef CONFIG_VT

struct screen_info screen_info;

#endif



/* Copy a short hook instruction sequence to the exception address */

static inline void copy_exception_handler(unsigned int addr)

{