From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED79FCD6137 for ; Mon, 9 Oct 2023 21:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378830AbjJIVUa (ORCPT ); Mon, 9 Oct 2023 17:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378722AbjJIVUH (ORCPT ); Mon, 9 Oct 2023 17:20:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B62136; Mon, 9 Oct 2023 14:19:52 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11ACEC4339A; Mon, 9 Oct 2023 21:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886391; bh=Y6nnyfmtTcWoPREzqbIFTBI+9WLOEmya+e4ZqStyynQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KIVyWshcorp4nyq4Qk8+l0N1N8+nlUOM6IHaO+AooXEfX9m85kJLXCLn75X4Qr9ox G4sPNTfqWNhVMkCj2BOx94nD/0py2qYjiSpQFth1je1eVBkTQ88qLiLMHg+b/babCq +LhuxXndG6txOrnhrIxYrR4rksZxoPuZOvtjtURC5mPPqGVCFSB8odMDjbooOR75+t aoDnY8GZzp+1s+3o84/onKNQTMcrpjC/XU1u6lNHnNpEsQXgX7ZpElKu3I1YwR9eSR sfTOjmKNG31tAW19dyOMjcoA1T271m2UFMWkp6F9XUTJ3PERoQ4K1KW4ad1WnkCYie SgV4Viirn0LbQ== From: Arnd Bergmann To: Thomas Zimmermann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Arnd Bergmann , "David S. Miller" , "K. Y. Srinivasan" , Ard Biesheuvel , Borislav Petkov , Brian Cain , Catalin Marinas , Christophe Leroy , Daniel Vetter , Dave Hansen , David Airlie , Deepak Rawat , Dexuan Cui , Dinh Nguyen , Greg Kroah-Hartman , Guo Ren , Haiyang Zhang , Helge Deller , Huacai Chen , Ingo Molnar , Javier Martinez Canillas , John Paul Adrian Glaubitz , Khalid Aziz , Linus Walleij , Matt Turner , Max Filippov , Michael Ellerman , Nicholas Piggin , Palmer Dabbelt , Russell King , Thomas Bogendoerfer , Thomas Gleixner , WANG Xuerui , Wei Liu , Will Deacon , x86@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-hyperv@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt Subject: [PATCH v3 4/9] vgacon, arch/*: remove unused screen_info definitions Date: Mon, 9 Oct 2023 23:18:40 +0200 Message-Id: <20231009211845.3136536-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009211845.3136536-1-arnd@kernel.org> References: <20231009211845.3136536-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-alpha@vger.kernel.org From: Arnd Bergmann 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: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann Reviewed-by: Philippe Mathieu-Daudé Acked-by: Dinh Nguyen Acked-by: Max Filippov Acked-by: Palmer Dabbelt Acked-by: Guo Ren Acked-by: Helge Deller Signed-off-by: Arnd Bergmann --- arch/csky/kernel/setup.c | 12 ------------ arch/hexagon/kernel/Makefile | 2 -- arch/hexagon/kernel/screen_info.c | 3 --- arch/mips/jazz/setup.c | 9 --------- arch/nios2/kernel/setup.c | 5 ----- arch/sh/kernel/setup.c | 5 ----- arch/sparc/kernel/setup_32.c | 13 ------------- arch/sparc/kernel/setup_64.c | 13 ------------- arch/xtensa/kernel/setup.c | 12 ------------ 9 files changed, 74 deletions(-) delete mode 100644 arch/hexagon/kernel/screen_info.c diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index 106fbf0b6f3b4..51012e90780d6 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -8,22 +8,10 @@ #include #include #include -#include #include #include #include -#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); diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile index e73cb321630ec..3fdf937eb572e 100644 --- a/arch/hexagon/kernel/Makefile +++ b/arch/hexagon/kernel/Makefile @@ -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 diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c deleted file mode 100644 index 1e1ceb18bafe7..0000000000000 --- a/arch/hexagon/kernel/screen_info.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - -struct screen_info screen_info; diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index ee044261eb223..23059ead773fc 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -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"); } diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 8582ed9658447..da122a5fa43b2 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -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) { diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index b3da2757faaf3..3d80515298d26 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -7,7 +7,6 @@ * Copyright (C) 1999 Niibe Yutaka * Copyright (C) 2002 - 2010 Paul Mundt */ -#include #include #include #include @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); struct sh_machine_vector sh_mv = { .mv_name = "generic", }; EXPORT_SYMBOL(sh_mv); -#ifdef CONFIG_VT -struct screen_info screen_info; -#endif - extern int root_mountflags; #define RAMDISK_IMAGE_START_MASK 0x07FF diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 34ef7febf0d56..e3b72a7b46d37 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -51,18 +50,6 @@ #include "kernel.h" -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0,0,0, /* ega_ax, ega_bx, ega_cx */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - /* Typing sync at the prom prompt calls the function pointed to by * romvec->pv_synchook which I set to the following function. * This should sync all filesystems and return, for now it just diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 6546ca9d4d3f1..6a4797dec34b4 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -68,18 +67,6 @@ DEFINE_SPINLOCK(ns87303_lock); EXPORT_SYMBOL(ns87303_lock); -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0, 0, 0, /* unused, ega_bx, unused */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - static void prom_console_write(struct console *con, const char *s, unsigned int n) { diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 52d6e4870a04c..bdec4a773af09 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -49,17 +48,6 @@ #include #include -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) -struct screen_info screen_info = { - .orig_x = 0, - .orig_y = 24, - .orig_video_cols = 80, - .orig_video_lines = 24, - .orig_video_isVGA = 1, - .orig_video_points = 16, -}; -#endif - #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long initrd_start; extern unsigned long initrd_end; -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CFC2ACD6139 for ; Mon, 9 Oct 2023 21:20:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=omqH4ZlyuZyh+ipSL1aneSFq/y2L8BDYzBE76lmVnc8=; b=HHM328qPHvFnOT 4Th2WWTuiBMOCg5kbXrGP8xHw0XSDJvkJGxQhPGU/aO3i/GnybfWefzc4R2liri4dFkm+u+u9NU6R bs1Xuxh1jrzFdQ05dPiJUIFvQwtTwd6hLv70ZBVQCSInDJi6u6Zxdve5xtawIgx6SL5UFp3719upF 0clkLJ9yX6a0tPjnrJtQ/DsjN1R3Zf1W3l1j6l7PJkmqmaxvRFc/hr+9sb4Gy7crFZcr77mHYwenn Hg18CtiU9XFkPB69wWVRpU2FAEXHnydYtnBQk95k9OoDANaTXLOLc1rwWvE7I7wQrZemR/7HdgbIq gFDU3WQAD++F/DIMIw8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpxfS-00Bdoe-0S; Mon, 09 Oct 2023 21:19:58 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpxfM-00BdmZ-32; Mon, 09 Oct 2023 21:19:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0A53E60109; Mon, 9 Oct 2023 21:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11ACEC4339A; Mon, 9 Oct 2023 21:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886391; bh=Y6nnyfmtTcWoPREzqbIFTBI+9WLOEmya+e4ZqStyynQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KIVyWshcorp4nyq4Qk8+l0N1N8+nlUOM6IHaO+AooXEfX9m85kJLXCLn75X4Qr9ox G4sPNTfqWNhVMkCj2BOx94nD/0py2qYjiSpQFth1je1eVBkTQ88qLiLMHg+b/babCq +LhuxXndG6txOrnhrIxYrR4rksZxoPuZOvtjtURC5mPPqGVCFSB8odMDjbooOR75+t aoDnY8GZzp+1s+3o84/onKNQTMcrpjC/XU1u6lNHnNpEsQXgX7ZpElKu3I1YwR9eSR sfTOjmKNG31tAW19dyOMjcoA1T271m2UFMWkp6F9XUTJ3PERoQ4K1KW4ad1WnkCYie SgV4Viirn0LbQ== From: Arnd Bergmann To: Thomas Zimmermann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Arnd Bergmann , "David S. Miller" , "K. Y. Srinivasan" , Ard Biesheuvel , Borislav Petkov , Brian Cain , Catalin Marinas , Christophe Leroy , Daniel Vetter , Dave Hansen , David Airlie , Deepak Rawat , Dexuan Cui , Dinh Nguyen , Greg Kroah-Hartman , Guo Ren , Haiyang Zhang , Helge Deller , Huacai Chen , Ingo Molnar , Javier Martinez Canillas , John Paul Adrian Glaubitz , Khalid Aziz , Linus Walleij , Matt Turner , Max Filippov , Michael Ellerman , Nicholas Piggin , Palmer Dabbelt , Russell King , Thomas Bogendoerfer , Thomas Gleixner , WANG Xuerui , Wei Liu , Will Deacon , x86@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-hyperv@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt Subject: [PATCH v3 4/9] vgacon, arch/*: remove unused screen_info definitions Date: Mon, 9 Oct 2023 23:18:40 +0200 Message-Id: <20231009211845.3136536-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009211845.3136536-1-arnd@kernel.org> References: <20231009211845.3136536-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231009_141953_068621_7F6DB652 X-CRM114-Status: GOOD ( 21.77 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org RnJvbTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KCkEgbnVtYmVyIG9mIGFyY2hpdGVj dHVyZXMgZWl0aGVyIGtlcHQgdGhlIHNjcmVlbl9pbmZvIGRlZmluaXRpb24gZm9yCmhpc3Rvcmlj YWwgcHVycG9zZXMgYXMgaXQgdXNlZCB0byBiZSByZXF1aXJlZCBieSB0aGUgZ2VuZXJpYyBWVCBj b2RlLCBvcgp0aGV5IGNvcGllZCBpdCBmcm9tIGFub3RoZXIgYXJjaGl0ZWN0dXJlIGluIG9yZGVy IHRvIGJ1aWxkIHRoZSBWR0EgY29uc29sZQpkcml2ZXIgaW4gYW4gYWxsbW9kY29uZmlnIGJ1aWxk LiBUaGUgbWlwcyBkZWZpbml0aW9uIGlzIHVzZWQgYnkgc29tZQpwbGF0Zm9ybXMsIGJ1dCB0aGUg aW5pdGlhbGl6YXRpb24gb24gamF6eiBpcyBub3QgbmVlZGVkLgoKTm93IHRoYXQgdmdhY29uIG5v IGxvbmdlciBidWlsZHMgb24gdGhlc2UgYXJjaGl0ZWN0dXJlcywgcmVtb3ZlIHRoZQpzdGFsZSBk ZWZpbml0aW9ucyBhbmQgaW5pdGlhbGl6YXRpb25zLgoKUmV2aWV3ZWQtYnk6IEphdmllciBNYXJ0 aW5leiBDYW5pbGxhcyA8amF2aWVybUByZWRoYXQuY29tPgpSZXZpZXdlZC1ieTogVGhvbWFzIFpp bW1lcm1hbm4gPHR6aW1tZXJtYW5uQHN1c2UuZGU+ClJldmlld2VkLWJ5OiBQaGlsaXBwZSBNYXRo aWV1LURhdWTDqSA8cGhpbG1kQGxpbmFyby5vcmc+CkFja2VkLWJ5OiBEaW5oIE5ndXllbiA8ZGlu Z3V5ZW5Aa2VybmVsLm9yZz4KQWNrZWQtYnk6IE1heCBGaWxpcHBvdiA8amNtdmJrYmNAZ21haWwu Y29tPgpBY2tlZC1ieTogUGFsbWVyIERhYmJlbHQgPHBhbG1lckByaXZvc2luYy5jb20+CkFja2Vk LWJ5OiBHdW8gUmVuIDxndW9yZW5Aa2VybmVsLm9yZz4KQWNrZWQtYnk6IEhlbGdlIERlbGxlciA8 ZGVsbGVyQGdteC5kZT4KU2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5k ZT4KLS0tCiBhcmNoL2Nza3kva2VybmVsL3NldHVwLmMgICAgICAgICAgfCAxMiAtLS0tLS0tLS0t LS0KIGFyY2gvaGV4YWdvbi9rZXJuZWwvTWFrZWZpbGUgICAgICB8ICAyIC0tCiBhcmNoL2hleGFn b24va2VybmVsL3NjcmVlbl9pbmZvLmMgfCAgMyAtLS0KIGFyY2gvbWlwcy9qYXp6L3NldHVwLmMg ICAgICAgICAgICB8ICA5IC0tLS0tLS0tLQogYXJjaC9uaW9zMi9rZXJuZWwvc2V0dXAuYyAgICAg ICAgIHwgIDUgLS0tLS0KIGFyY2gvc2gva2VybmVsL3NldHVwLmMgICAgICAgICAgICB8ICA1IC0t LS0tCiBhcmNoL3NwYXJjL2tlcm5lbC9zZXR1cF8zMi5jICAgICAgfCAxMyAtLS0tLS0tLS0tLS0t CiBhcmNoL3NwYXJjL2tlcm5lbC9zZXR1cF82NC5jICAgICAgfCAxMyAtLS0tLS0tLS0tLS0tCiBh cmNoL3h0ZW5zYS9rZXJuZWwvc2V0dXAuYyAgICAgICAgfCAxMiAtLS0tLS0tLS0tLS0KIDkgZmls ZXMgY2hhbmdlZCwgNzQgZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgYXJjaC9oZXhh Z29uL2tlcm5lbC9zY3JlZW5faW5mby5jCgpkaWZmIC0tZ2l0IGEvYXJjaC9jc2t5L2tlcm5lbC9z ZXR1cC5jIGIvYXJjaC9jc2t5L2tlcm5lbC9zZXR1cC5jCmluZGV4IDEwNmZiZjBiNmYzYjQuLjUx MDEyZTkwNzgwZDYgMTAwNjQ0Ci0tLSBhL2FyY2gvY3NreS9rZXJuZWwvc2V0dXAuYworKysgYi9h cmNoL2Nza3kva2VybmVsL3NldHVwLmMKQEAgLTgsMjIgKzgsMTAgQEAKICNpbmNsdWRlIDxsaW51 eC9vZl9mZHQuaD4KICNpbmNsdWRlIDxsaW51eC9zdGFydF9rZXJuZWwuaD4KICNpbmNsdWRlIDxs aW51eC9kbWEtbWFwLW9wcy5oPgotI2luY2x1ZGUgPGxpbnV4L3NjcmVlbl9pbmZvLmg+CiAjaW5j bHVkZSA8YXNtL3NlY3Rpb25zLmg+CiAjaW5jbHVkZSA8YXNtL21tdV9jb250ZXh0Lmg+CiAjaW5j bHVkZSA8YXNtL3BnYWxsb2MuaD4KIAotI2lmZGVmIENPTkZJR19EVU1NWV9DT05TT0xFCi1zdHJ1 Y3Qgc2NyZWVuX2luZm8gc2NyZWVuX2luZm8gPSB7Ci0JLm9yaWdfdmlkZW9fbGluZXMJPSAzMCwK LQkub3JpZ192aWRlb19jb2xzCT0gODAsCi0JLm9yaWdfdmlkZW9fbW9kZQk9IDAsCi0JLm9yaWdf dmlkZW9fZWdhX2J4CT0gMCwKLQkub3JpZ192aWRlb19pc1ZHQQk9IDEsCi0JLm9yaWdfdmlkZW9f cG9pbnRzCT0gOAotfTsKLSNlbmRpZgotCiBzdGF0aWMgdm9pZCBfX2luaXQgY3NreV9tZW1ibG9j a19pbml0KHZvaWQpCiB7CiAJdW5zaWduZWQgbG9uZyBsb3dtZW1fc2l6ZSA9IFBGTl9ET1dOKExP V01FTV9MSU1JVCAtIFBIWVNfT0ZGU0VUX09GRlNFVCk7CmRpZmYgLS1naXQgYS9hcmNoL2hleGFn b24va2VybmVsL01ha2VmaWxlIGIvYXJjaC9oZXhhZ29uL2tlcm5lbC9NYWtlZmlsZQppbmRleCBl NzNjYjMyMTYzMGVjLi4zZmRmOTM3ZWI1NzJlIDEwMDY0NAotLS0gYS9hcmNoL2hleGFnb24va2Vy bmVsL01ha2VmaWxlCisrKyBiL2FyY2gvaGV4YWdvbi9rZXJuZWwvTWFrZWZpbGUKQEAgLTE3LDUg KzE3LDMgQEAgb2JqLXkgKz0gdm1fdmVjdG9ycy5vCiBvYmotJChDT05GSUdfSEFTX0RNQSkgKz0g ZG1hLm8KIAogb2JqLSQoQ09ORklHX1NUQUNLVFJBQ0UpICs9IHN0YWNrdHJhY2UubwotCi1vYmot JChDT05GSUdfVkdBX0NPTlNPTEUpICs9IHNjcmVlbl9pbmZvLm8KZGlmZiAtLWdpdCBhL2FyY2gv aGV4YWdvbi9rZXJuZWwvc2NyZWVuX2luZm8uYyBiL2FyY2gvaGV4YWdvbi9rZXJuZWwvc2NyZWVu X2luZm8uYwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMWUxY2ViMThiYWZlNy4uMDAw MDAwMDAwMDAwMAotLS0gYS9hcmNoL2hleGFnb24va2VybmVsL3NjcmVlbl9pbmZvLmMKKysrIC9k ZXYvbnVsbApAQCAtMSwzICswLDAgQEAKLSNpbmNsdWRlIDxsaW51eC9zY3JlZW5faW5mby5oPgot Ci1zdHJ1Y3Qgc2NyZWVuX2luZm8gc2NyZWVuX2luZm87CmRpZmYgLS1naXQgYS9hcmNoL21pcHMv amF6ei9zZXR1cC5jIGIvYXJjaC9taXBzL2phenovc2V0dXAuYwppbmRleCBlZTA0NDI2MWViMjIz Li4yMzA1OWVhZDc3M2ZjIDEwMDY0NAotLS0gYS9hcmNoL21pcHMvamF6ei9zZXR1cC5jCisrKyBi L2FyY2gvbWlwcy9qYXp6L3NldHVwLmMKQEAgLTEzLDcgKzEzLDYgQEAKICNpbmNsdWRlIDxsaW51 eC9pbml0Lmg+CiAjaW5jbHVkZSA8bGludXgvaW9wb3J0Lmg+CiAjaW5jbHVkZSA8bGludXgvY29u c29sZS5oPgotI2luY2x1ZGUgPGxpbnV4L3NjcmVlbl9pbmZvLmg+CiAjaW5jbHVkZSA8bGludXgv cGxhdGZvcm1fZGV2aWNlLmg+CiAjaW5jbHVkZSA8bGludXgvc2VyaWFsXzgyNTAuaD4KICNpbmNs dWRlIDxsaW51eC9kbWEtbWFwcGluZy5oPgpAQCAtNzYsMTQgKzc1LDYgQEAgdm9pZCBfX2luaXQg cGxhdF9tZW1fc2V0dXAodm9pZCkKIAogCV9tYWNoaW5lX3Jlc3RhcnQgPSBqYXp6X21hY2hpbmVf cmVzdGFydDsKIAotI2lmZGVmIENPTkZJR19WVAotCXNjcmVlbl9pbmZvID0gKHN0cnVjdCBzY3Jl ZW5faW5mbykgewotCQkub3JpZ192aWRlb19jb2xzCT0gMTYwLAotCQkub3JpZ192aWRlb19saW5l cwk9IDY0LAotCQkub3JpZ192aWRlb19wb2ludHMJPSAxNiwKLQl9OwotI2VuZGlmCi0KIAlhZGRf cHJlZmVycmVkX2NvbnNvbGUoInR0eVMiLCAwLCAiOTYwMCIpOwogfQogCmRpZmYgLS1naXQgYS9h cmNoL25pb3MyL2tlcm5lbC9zZXR1cC5jIGIvYXJjaC9uaW9zMi9rZXJuZWwvc2V0dXAuYwppbmRl eCA4NTgyZWQ5NjU4NDQ3Li5kYTEyMmE1ZmE0M2IyIDEwMDY0NAotLS0gYS9hcmNoL25pb3MyL2tl cm5lbC9zZXR1cC5jCisrKyBiL2FyY2gvbmlvczIva2VybmVsL3NldHVwLmMKQEAgLTE5LDcgKzE5 LDYgQEAKICNpbmNsdWRlIDxsaW51eC9tZW1ibG9jay5oPgogI2luY2x1ZGUgPGxpbnV4L2luaXRy ZC5oPgogI2luY2x1ZGUgPGxpbnV4L29mX2ZkdC5oPgotI2luY2x1ZGUgPGxpbnV4L3NjcmVlbl9p bmZvLmg+CiAKICNpbmNsdWRlIDxhc20vbW11X2NvbnRleHQuaD4KICNpbmNsdWRlIDxhc20vc2Vj dGlvbnMuaD4KQEAgLTM2LDEwICszNSw2IEBAIHN0YXRpYyBzdHJ1Y3QgcHRfcmVncyBmYWtlX3Jl Z3MgPSB7IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsCiAJCQkJ CTAsIDAsIDAsIDAsIDAsIDAsCiAJCQkJCTB9OwogCi0jaWZkZWYgQ09ORklHX1ZUCi1zdHJ1Y3Qg c2NyZWVuX2luZm8gc2NyZWVuX2luZm87Ci0jZW5kaWYKLQogLyogQ29weSBhIHNob3J0IGhvb2sg aW5zdHJ1Y3Rpb24gc2VxdWVuY2UgdG8gdGhlIGV4Y2VwdGlvbiBhZGRyZXNzICovCiBzdGF0aWMg aW5saW5lIHZvaWQgY29weV9leGNlcHRpb25faGFuZGxlcih1bnNpZ25lZCBpbnQgYWRkcikKIHsK ZGlmZiAtLWdpdCBhL2FyY2gvc2gva2VybmVsL3NldHVwLmMgYi9hcmNoL3NoL2tlcm5lbC9zZXR1 cC5jCmluZGV4IGIzZGEyNzU3ZmFhZjMuLjNkODA1MTUyOThkMjYgMTAwNjQ0Ci0tLSBhL2FyY2gv c2gva2VybmVsL3NldHVwLmMKKysrIGIvYXJjaC9zaC9rZXJuZWwvc2V0dXAuYwpAQCAtNyw3ICs3 LDYgQEAKICAqICBDb3B5cmlnaHQgKEMpIDE5OTkgIE5paWJlIFl1dGFrYQogICogIENvcHlyaWdo dCAoQykgMjAwMiAtIDIwMTAgUGF1bCBNdW5kdAogICovCi0jaW5jbHVkZSA8bGludXgvc2NyZWVu X2luZm8uaD4KICNpbmNsdWRlIDxsaW51eC9pb3BvcnQuaD4KICNpbmNsdWRlIDxsaW51eC9pbml0 Lmg+CiAjaW5jbHVkZSA8bGludXgvaW5pdHJkLmg+CkBAIC02OSwxMCArNjgsNiBAQCBFWFBPUlRf U1lNQk9MKGNwdV9kYXRhKTsKIHN0cnVjdCBzaF9tYWNoaW5lX3ZlY3RvciBzaF9tdiA9IHsgLm12 X25hbWUgPSAiZ2VuZXJpYyIsIH07CiBFWFBPUlRfU1lNQk9MKHNoX212KTsKIAotI2lmZGVmIENP TkZJR19WVAotc3RydWN0IHNjcmVlbl9pbmZvIHNjcmVlbl9pbmZvOwotI2VuZGlmCi0KIGV4dGVy biBpbnQgcm9vdF9tb3VudGZsYWdzOwogCiAjZGVmaW5lIFJBTURJU0tfSU1BR0VfU1RBUlRfTUFT SwkweDA3RkYKZGlmZiAtLWdpdCBhL2FyY2gvc3BhcmMva2VybmVsL3NldHVwXzMyLmMgYi9hcmNo L3NwYXJjL2tlcm5lbC9zZXR1cF8zMi5jCmluZGV4IDM0ZWY3ZmViZjBkNTYuLmUzYjcyYTdiNDZk MzcgMTAwNjQ0Ci0tLSBhL2FyY2gvc3BhcmMva2VybmVsL3NldHVwXzMyLmMKKysrIGIvYXJjaC9z cGFyYy9rZXJuZWwvc2V0dXBfMzIuYwpAQCAtMTcsNyArMTcsNiBAQAogI2luY2x1ZGUgPGxpbnV4 L2luaXRyZC5oPgogI2luY2x1ZGUgPGFzbS9zbXAuaD4KICNpbmNsdWRlIDxsaW51eC91c2VyLmg+ Ci0jaW5jbHVkZSA8bGludXgvc2NyZWVuX2luZm8uaD4KICNpbmNsdWRlIDxsaW51eC9kZWxheS5o PgogI2luY2x1ZGUgPGxpbnV4L2ZzLmg+CiAjaW5jbHVkZSA8bGludXgvc2VxX2ZpbGUuaD4KQEAg LTUxLDE4ICs1MCw2IEBACiAKICNpbmNsdWRlICJrZXJuZWwuaCIKIAotc3RydWN0IHNjcmVlbl9p bmZvIHNjcmVlbl9pbmZvID0gewotCTAsIDAsCQkJLyogb3JpZy14LCBvcmlnLXkgKi8KLQkwLAkJ CS8qIHVudXNlZCAqLwotCTAsCQkJLyogb3JpZy12aWRlby1wYWdlICovCi0JMCwJCQkvKiBvcmln LXZpZGVvLW1vZGUgKi8KLQkxMjgsCQkJLyogb3JpZy12aWRlby1jb2xzICovCi0JMCwwLDAsCQkJ LyogZWdhX2F4LCBlZ2FfYngsIGVnYV9jeCAqLwotCTU0LAkJCS8qIG9yaWctdmlkZW8tbGluZXMg Ki8KLQkwLCAgICAgICAgICAgICAgICAgICAgICAvKiBvcmlnLXZpZGVvLWlzVkdBICovCi0JMTYg ICAgICAgICAgICAgICAgICAgICAgLyogb3JpZy12aWRlby1wb2ludHMgKi8KLX07Ci0KIC8qIFR5 cGluZyBzeW5jIGF0IHRoZSBwcm9tIHByb21wdCBjYWxscyB0aGUgZnVuY3Rpb24gcG9pbnRlZCB0 byBieQogICogcm9tdmVjLT5wdl9zeW5jaG9vayB3aGljaCBJIHNldCB0byB0aGUgZm9sbG93aW5n IGZ1bmN0aW9uLgogICogVGhpcyBzaG91bGQgc3luYyBhbGwgZmlsZXN5c3RlbXMgYW5kIHJldHVy biwgZm9yIG5vdyBpdCBqdXN0CmRpZmYgLS1naXQgYS9hcmNoL3NwYXJjL2tlcm5lbC9zZXR1cF82 NC5jIGIvYXJjaC9zcGFyYy9rZXJuZWwvc2V0dXBfNjQuYwppbmRleCA2NTQ2Y2E5ZDRkM2YxLi42 YTQ3OTdkZWMzNGI0IDEwMDY0NAotLS0gYS9hcmNoL3NwYXJjL2tlcm5lbC9zZXR1cF82NC5jCisr KyBiL2FyY2gvc3BhcmMva2VybmVsL3NldHVwXzY0LmMKQEAgLTE1LDcgKzE1LDYgQEAKICNpbmNs dWRlIDxsaW51eC9wdHJhY2UuaD4KICNpbmNsdWRlIDxhc20vc21wLmg+CiAjaW5jbHVkZSA8bGlu dXgvdXNlci5oPgotI2luY2x1ZGUgPGxpbnV4L3NjcmVlbl9pbmZvLmg+CiAjaW5jbHVkZSA8bGlu dXgvZGVsYXkuaD4KICNpbmNsdWRlIDxsaW51eC9mcy5oPgogI2luY2x1ZGUgPGxpbnV4L3NlcV9m aWxlLmg+CkBAIC02OCwxOCArNjcsNiBAQAogREVGSU5FX1NQSU5MT0NLKG5zODczMDNfbG9jayk7 CiBFWFBPUlRfU1lNQk9MKG5zODczMDNfbG9jayk7CiAKLXN0cnVjdCBzY3JlZW5faW5mbyBzY3Jl ZW5faW5mbyA9IHsKLQkwLCAwLAkJCS8qIG9yaWcteCwgb3JpZy15ICovCi0JMCwJCQkvKiB1bnVz ZWQgKi8KLQkwLAkJCS8qIG9yaWctdmlkZW8tcGFnZSAqLwotCTAsCQkJLyogb3JpZy12aWRlby1t b2RlICovCi0JMTI4LAkJCS8qIG9yaWctdmlkZW8tY29scyAqLwotCTAsIDAsIDAsCQkvKiB1bnVz ZWQsIGVnYV9ieCwgdW51c2VkICovCi0JNTQsCQkJLyogb3JpZy12aWRlby1saW5lcyAqLwotCTAs ICAgICAgICAgICAgICAgICAgICAgIC8qIG9yaWctdmlkZW8taXNWR0EgKi8KLQkxNiAgICAgICAg ICAgICAgICAgICAgICAvKiBvcmlnLXZpZGVvLXBvaW50cyAqLwotfTsKLQogc3RhdGljIHZvaWQK IHByb21fY29uc29sZV93cml0ZShzdHJ1Y3QgY29uc29sZSAqY29uLCBjb25zdCBjaGFyICpzLCB1 bnNpZ25lZCBpbnQgbikKIHsKZGlmZiAtLWdpdCBhL2FyY2gveHRlbnNhL2tlcm5lbC9zZXR1cC5j IGIvYXJjaC94dGVuc2Eva2VybmVsL3NldHVwLmMKaW5kZXggNTJkNmU0ODcwYTA0Yy4uYmRlYzRh NzczYWYwOSAxMDA2NDQKLS0tIGEvYXJjaC94dGVuc2Eva2VybmVsL3NldHVwLmMKKysrIGIvYXJj aC94dGVuc2Eva2VybmVsL3NldHVwLmMKQEAgLTE5LDcgKzE5LDYgQEAKICNpbmNsdWRlIDxsaW51 eC9pbml0Lmg+CiAjaW5jbHVkZSA8bGludXgvbW0uaD4KICNpbmNsdWRlIDxsaW51eC9wcm9jX2Zz Lmg+Ci0jaW5jbHVkZSA8bGludXgvc2NyZWVuX2luZm8uaD4KICNpbmNsdWRlIDxsaW51eC9rZXJu ZWwuaD4KICNpbmNsdWRlIDxsaW51eC9wZXJjcHUuaD4KICNpbmNsdWRlIDxsaW51eC9yZWJvb3Qu aD4KQEAgLTQ5LDE3ICs0OCw2IEBACiAjaW5jbHVkZSA8YXNtL3RpbWV4Lmg+CiAjaW5jbHVkZSA8 YXNtL3RyYXBzLmg+CiAKLSNpZiBkZWZpbmVkKENPTkZJR19WR0FfQ09OU09MRSkgfHwgZGVmaW5l ZChDT05GSUdfRFVNTVlfQ09OU09MRSkKLXN0cnVjdCBzY3JlZW5faW5mbyBzY3JlZW5faW5mbyA9 IHsKLQkub3JpZ194ID0gMCwKLQkub3JpZ195ID0gMjQsCi0JLm9yaWdfdmlkZW9fY29scyA9IDgw LAotCS5vcmlnX3ZpZGVvX2xpbmVzID0gMjQsCi0JLm9yaWdfdmlkZW9faXNWR0EgPSAxLAotCS5v cmlnX3ZpZGVvX3BvaW50cyA9IDE2LAotfTsKLSNlbmRpZgotCiAjaWZkZWYgQ09ORklHX0JMS19E RVZfSU5JVFJECiBleHRlcm4gdW5zaWduZWQgbG9uZyBpbml0cmRfc3RhcnQ7CiBleHRlcm4gdW5z aWduZWQgbG9uZyBpbml0cmRfZW5kOwotLSAKMi4zOS4yCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtcmlzY3YgbWFpbGluZyBsaXN0CmxpbnV4 LXJpc2N2QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1yaXNjdgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE896CD613A for ; Mon, 9 Oct 2023 21:23:31 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=KIVyWshc; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4S4Bpp45xfz3cbP for ; Tue, 10 Oct 2023 08:23:30 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=KIVyWshc; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=arnd@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4S4Bkf6pDVz3cnZ for ; Tue, 10 Oct 2023 08:19:54 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0A53E60109; Mon, 9 Oct 2023 21:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11ACEC4339A; Mon, 9 Oct 2023 21:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886391; bh=Y6nnyfmtTcWoPREzqbIFTBI+9WLOEmya+e4ZqStyynQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KIVyWshcorp4nyq4Qk8+l0N1N8+nlUOM6IHaO+AooXEfX9m85kJLXCLn75X4Qr9ox G4sPNTfqWNhVMkCj2BOx94nD/0py2qYjiSpQFth1je1eVBkTQ88qLiLMHg+b/babCq +LhuxXndG6txOrnhrIxYrR4rksZxoPuZOvtjtURC5mPPqGVCFSB8odMDjbooOR75+t aoDnY8GZzp+1s+3o84/onKNQTMcrpjC/XU1u6lNHnNpEsQXgX7ZpElKu3I1YwR9eSR sfTOjmKNG31tAW19dyOMjcoA1T271m2UFMWkp6F9XUTJ3PERoQ4K1KW4ad1WnkCYie SgV4Viirn0LbQ== From: Arnd Bergmann To: Thomas Zimmermann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 4/9] vgacon, arch/*: remove unused screen_info definitions Date: Mon, 9 Oct 2023 23:18:40 +0200 Message-Id: <20231009211845.3136536-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009211845.3136536-1-arnd@kernel.org> References: <20231009211845.3136536-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-hyperv@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Catalin Marinas , Linus Walleij , Dave Hansen , Palmer Dabbelt , Russell King , Max Filippov , Will Deacon , linux-efi@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org, sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, WANG Xuerui , "K. Y. Srinivasan" , David Airlie , Ard Biesheuvel , Wei Liu , Helge Deller , Huacai Chen , Dexuan Cui , Javier Martinez Canillas , Deepak Rawat , Ingo Molnar , Matt Turner , linux-mips@vger.kernel.org, Arnd Bergmann , Haiyang Zhang , Nicholas Piggin , Borislav Petkov , loongarch@lists.linux.dev, John Paul Adrian Glaubitz , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Khalid Aziz , Brian Cain , Thomas Bogendoerfer , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Dinh Nguyen , linux-riscv@lists.infradead.org, Palmer Dabbelt , Daniel Vetter , linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Arnd Bergmann 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: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann Reviewed-by: Philippe Mathieu-Daudé Acked-by: Dinh Nguyen Acked-by: Max Filippov Acked-by: Palmer Dabbelt Acked-by: Guo Ren Acked-by: Helge Deller Signed-off-by: Arnd Bergmann --- arch/csky/kernel/setup.c | 12 ------------ arch/hexagon/kernel/Makefile | 2 -- arch/hexagon/kernel/screen_info.c | 3 --- arch/mips/jazz/setup.c | 9 --------- arch/nios2/kernel/setup.c | 5 ----- arch/sh/kernel/setup.c | 5 ----- arch/sparc/kernel/setup_32.c | 13 ------------- arch/sparc/kernel/setup_64.c | 13 ------------- arch/xtensa/kernel/setup.c | 12 ------------ 9 files changed, 74 deletions(-) delete mode 100644 arch/hexagon/kernel/screen_info.c diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index 106fbf0b6f3b4..51012e90780d6 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -8,22 +8,10 @@ #include #include #include -#include #include #include #include -#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); diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile index e73cb321630ec..3fdf937eb572e 100644 --- a/arch/hexagon/kernel/Makefile +++ b/arch/hexagon/kernel/Makefile @@ -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 diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c deleted file mode 100644 index 1e1ceb18bafe7..0000000000000 --- a/arch/hexagon/kernel/screen_info.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - -struct screen_info screen_info; diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index ee044261eb223..23059ead773fc 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -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"); } diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 8582ed9658447..da122a5fa43b2 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -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) { diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index b3da2757faaf3..3d80515298d26 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -7,7 +7,6 @@ * Copyright (C) 1999 Niibe Yutaka * Copyright (C) 2002 - 2010 Paul Mundt */ -#include #include #include #include @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); struct sh_machine_vector sh_mv = { .mv_name = "generic", }; EXPORT_SYMBOL(sh_mv); -#ifdef CONFIG_VT -struct screen_info screen_info; -#endif - extern int root_mountflags; #define RAMDISK_IMAGE_START_MASK 0x07FF diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 34ef7febf0d56..e3b72a7b46d37 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -51,18 +50,6 @@ #include "kernel.h" -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0,0,0, /* ega_ax, ega_bx, ega_cx */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - /* Typing sync at the prom prompt calls the function pointed to by * romvec->pv_synchook which I set to the following function. * This should sync all filesystems and return, for now it just diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 6546ca9d4d3f1..6a4797dec34b4 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -68,18 +67,6 @@ DEFINE_SPINLOCK(ns87303_lock); EXPORT_SYMBOL(ns87303_lock); -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0, 0, 0, /* unused, ega_bx, unused */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - static void prom_console_write(struct console *con, const char *s, unsigned int n) { diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 52d6e4870a04c..bdec4a773af09 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -49,17 +48,6 @@ #include #include -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) -struct screen_info screen_info = { - .orig_x = 0, - .orig_y = 24, - .orig_video_cols = 80, - .orig_video_lines = 24, - .orig_video_isVGA = 1, - .orig_video_points = 16, -}; -#endif - #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long initrd_start; extern unsigned long initrd_end; -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84CD9CD613B for ; Mon, 9 Oct 2023 21:19:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B90EA10E2ED; Mon, 9 Oct 2023 21:19:54 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1CC510E2ED for ; Mon, 9 Oct 2023 21:19:52 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0A53E60109; Mon, 9 Oct 2023 21:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11ACEC4339A; Mon, 9 Oct 2023 21:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886391; bh=Y6nnyfmtTcWoPREzqbIFTBI+9WLOEmya+e4ZqStyynQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KIVyWshcorp4nyq4Qk8+l0N1N8+nlUOM6IHaO+AooXEfX9m85kJLXCLn75X4Qr9ox G4sPNTfqWNhVMkCj2BOx94nD/0py2qYjiSpQFth1je1eVBkTQ88qLiLMHg+b/babCq +LhuxXndG6txOrnhrIxYrR4rksZxoPuZOvtjtURC5mPPqGVCFSB8odMDjbooOR75+t aoDnY8GZzp+1s+3o84/onKNQTMcrpjC/XU1u6lNHnNpEsQXgX7ZpElKu3I1YwR9eSR sfTOjmKNG31tAW19dyOMjcoA1T271m2UFMWkp6F9XUTJ3PERoQ4K1KW4ad1WnkCYie SgV4Viirn0LbQ== From: Arnd Bergmann To: Thomas Zimmermann , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 4/9] vgacon, arch/*: remove unused screen_info definitions Date: Mon, 9 Oct 2023 23:18:40 +0200 Message-Id: <20231009211845.3136536-5-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009211845.3136536-1-arnd@kernel.org> References: <20231009211845.3136536-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-hyperv@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Catalin Marinas , Dave Hansen , Palmer Dabbelt , Russell King , Max Filippov , Will Deacon , linux-efi@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org, sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, WANG Xuerui , "K. Y. Srinivasan" , Ard Biesheuvel , Wei Liu , Michael Ellerman , Helge Deller , Huacai Chen , Dexuan Cui , Javier Martinez Canillas , Christophe Leroy , Deepak Rawat , Ingo Molnar , Matt Turner , linux-mips@vger.kernel.org, Arnd Bergmann , Haiyang Zhang , Nicholas Piggin , Borislav Petkov , loongarch@lists.linux.dev, John Paul Adrian Glaubitz , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Khalid Aziz , Brian Cain , Thomas Bogendoerfer , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Dinh Nguyen , linux-riscv@lists.infradead.org, Palmer Dabbelt , linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann 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: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann Reviewed-by: Philippe Mathieu-Daudé Acked-by: Dinh Nguyen Acked-by: Max Filippov Acked-by: Palmer Dabbelt Acked-by: Guo Ren Acked-by: Helge Deller Signed-off-by: Arnd Bergmann --- arch/csky/kernel/setup.c | 12 ------------ arch/hexagon/kernel/Makefile | 2 -- arch/hexagon/kernel/screen_info.c | 3 --- arch/mips/jazz/setup.c | 9 --------- arch/nios2/kernel/setup.c | 5 ----- arch/sh/kernel/setup.c | 5 ----- arch/sparc/kernel/setup_32.c | 13 ------------- arch/sparc/kernel/setup_64.c | 13 ------------- arch/xtensa/kernel/setup.c | 12 ------------ 9 files changed, 74 deletions(-) delete mode 100644 arch/hexagon/kernel/screen_info.c diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index 106fbf0b6f3b4..51012e90780d6 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -8,22 +8,10 @@ #include #include #include -#include #include #include #include -#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); diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile index e73cb321630ec..3fdf937eb572e 100644 --- a/arch/hexagon/kernel/Makefile +++ b/arch/hexagon/kernel/Makefile @@ -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 diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c deleted file mode 100644 index 1e1ceb18bafe7..0000000000000 --- a/arch/hexagon/kernel/screen_info.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - -struct screen_info screen_info; diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index ee044261eb223..23059ead773fc 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -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"); } diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 8582ed9658447..da122a5fa43b2 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -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) { diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index b3da2757faaf3..3d80515298d26 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -7,7 +7,6 @@ * Copyright (C) 1999 Niibe Yutaka * Copyright (C) 2002 - 2010 Paul Mundt */ -#include #include #include #include @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); struct sh_machine_vector sh_mv = { .mv_name = "generic", }; EXPORT_SYMBOL(sh_mv); -#ifdef CONFIG_VT -struct screen_info screen_info; -#endif - extern int root_mountflags; #define RAMDISK_IMAGE_START_MASK 0x07FF diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 34ef7febf0d56..e3b72a7b46d37 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -51,18 +50,6 @@ #include "kernel.h" -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0,0,0, /* ega_ax, ega_bx, ega_cx */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - /* Typing sync at the prom prompt calls the function pointed to by * romvec->pv_synchook which I set to the following function. * This should sync all filesystems and return, for now it just diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 6546ca9d4d3f1..6a4797dec34b4 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -68,18 +67,6 @@ DEFINE_SPINLOCK(ns87303_lock); EXPORT_SYMBOL(ns87303_lock); -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0, 0, 0, /* unused, ega_bx, unused */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - static void prom_console_write(struct console *con, const char *s, unsigned int n) { diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 52d6e4870a04c..bdec4a773af09 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -49,17 +48,6 @@ #include #include -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) -struct screen_info screen_info = { - .orig_x = 0, - .orig_y = 24, - .orig_video_cols = 80, - .orig_video_lines = 24, - .orig_video_isVGA = 1, - .orig_video_points = 16, -}; -#endif - #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long initrd_start; extern unsigned long initrd_end; -- 2.39.2