From patchwork Wed Jun 12 13:41:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13695010 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 E9368C27C53 for ; Wed, 12 Jun 2024 13:41:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF73110E12E; Wed, 12 Jun 2024 13:41:25 +0000 (UTC) Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CC5610E12E for ; Wed, 12 Jun 2024 13:41:22 +0000 (UTC) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4VzmsY0G4xz4wxL9 for ; Wed, 12 Jun 2024 15:41:21 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:170b:1b4a:247:a009]) by andre.telenet-ops.be with bizsmtp id adhK2C0073axqkY01dhKtR; Wed, 12 Jun 2024 15:41:20 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1sHOD0-008cdj-7Y; Wed, 12 Jun 2024 15:41:19 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1sHOE3-00EaMZ-A5; Wed, 12 Jun 2024 15:41:19 +0200 From: Geert Uytterhoeven To: Helge Deller Cc: Stephen Rothwell , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Geert Uytterhoeven Subject: [PATCH] video/logo: Make logo data const again Date: Wed, 12 Jun 2024 15:41:17 +0200 Message-Id: <1ea18c51dd1c029e3c50bfb082f5942b58b7360c.1718199543.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As gcc-4.1 is no longer supported, the logo data can be made const again. Hence revert commit 15e3252464432a29 ("fbdev: work around old compiler bug"). Signed-off-by: Geert Uytterhoeven --- drivers/video/logo/pnmtologo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c index 8080c4d9c4a23fbb..28d9f0b907a99a05 100644 --- a/drivers/video/logo/pnmtologo.c +++ b/drivers/video/logo/pnmtologo.c @@ -238,7 +238,7 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); fputs("#include \n\n", out); - fprintf(out, "static unsigned char %s_data[] __initdata = {\n", + fprintf(out, "static const unsigned char %s_data[] __initconst = {\n", logoname); } @@ -375,7 +375,7 @@ static void write_logo_clut224(void) fputs("\n};\n\n", out); /* write logo clut */ - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n", + fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n", logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) {