diff mbox series

video/logo: Make logo data const again

Message ID 1ea18c51dd1c029e3c50bfb082f5942b58b7360c.1718199543.git.geert+renesas@glider.be
State New
Headers show
Series video/logo: Make logo data const again | expand

Commit Message

Geert Uytterhoeven June 12, 2024, 1:41 p.m. UTC
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 <geert+renesas@glider.be>
---
 drivers/video/logo/pnmtologo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Helge Deller June 13, 2024, 9:06 p.m. UTC | #1
On 6/12/24 15:41, Geert Uytterhoeven wrote:
> 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 <geert+renesas@glider.be>

applied.
Thanks!

Helge

> ---
>   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 <linux/linux_logo.h>\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++) {
diff mbox series

Patch

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 <linux/linux_logo.h>\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++) {