Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbcon: Convert struct font_desc to use ISO C initializers

Akpm's patch "newport_con warning fix" got me to look at the console drivers
again and one thing that I noticed was that none of the fonts was using ISO
initializers for it's fonts.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ralf Baechle and committed by
Linus Torvalds
908633f3 ad41b439

+65 -64
+7 -7
drivers/video/console/font_10x18.c
··· 5133 5133 5134 5134 5135 5135 const struct font_desc font_10x18 = { 5136 - FONT10x18_IDX, 5137 - "10x18", 5138 - 10, 5139 - 18, 5140 - fontdata_10x18, 5136 + .idx = FONT10x18_IDX, 5137 + .name = "10x18", 5138 + .width = 10, 5139 + .height = 18, 5140 + .data = fontdata_10x18, 5141 5141 #ifdef __sparc__ 5142 - 5 5142 + .pref = 5, 5143 5143 #else 5144 - -1 5144 + .pref = -1, 5145 5145 #endif 5146 5146 };
+7 -6
drivers/video/console/font_6x11.c
··· 3342 3342 3343 3343 3344 3344 const struct font_desc font_vga_6x11 = { 3345 - VGA6x11_IDX, 3346 - "ProFont6x11", 3347 - 6, 3348 - 11, 3349 - fontdata_6x11, 3350 - -2000 /* Try avoiding this font if possible unless on MAC */ 3345 + .idx = VGA6x11_IDX, 3346 + .name = "ProFont6x11", 3347 + .width = 6, 3348 + .height = 11, 3349 + .data = fontdata_6x11, 3350 + /* Try avoiding this font if possible unless on MAC */ 3351 + .pref = -2000, 3351 3352 };
+6 -6
drivers/video/console/font_7x14.c
··· 4109 4109 4110 4110 4111 4111 const struct font_desc font_7x14 = { 4112 - FONT7x14_IDX, 4113 - "7x14", 4114 - 7, 4115 - 14, 4116 - fontdata_7x14, 4117 - 0 4112 + .idx = FONT7x14_IDX, 4113 + .name = "7x14", 4114 + .width = 7, 4115 + .height = 14, 4116 + .data = fontdata_7x14, 4117 + .pref = 0, 4118 4118 };
+6 -6
drivers/video/console/font_8x16.c
··· 4622 4622 4623 4623 4624 4624 const struct font_desc font_vga_8x16 = { 4625 - VGA8x16_IDX, 4626 - "VGA8x16", 4627 - 8, 4628 - 16, 4629 - fontdata_8x16, 4630 - 0 4625 + .idx = VGA8x16_IDX, 4626 + .name = "VGA8x16", 4627 + .width = 8, 4628 + .height = 16, 4629 + .data = fontdata_8x16, 4630 + .pref = 0, 4631 4631 };
+6 -6
drivers/video/console/font_8x8.c
··· 2574 2574 2575 2575 2576 2576 const struct font_desc font_vga_8x8 = { 2577 - VGA8x8_IDX, 2578 - "VGA8x8", 2579 - 8, 2580 - 8, 2581 - fontdata_8x8, 2582 - 0 2577 + .idx = VGA8x8_IDX, 2578 + .name = "VGA8x8", 2579 + .width = 8, 2580 + .height = 8, 2581 + .data = fontdata_8x8, 2582 + .pref = 0, 2583 2583 };
+7 -7
drivers/video/console/font_acorn_8x8.c
··· 262 262 }; 263 263 264 264 const struct font_desc font_acorn_8x8 = { 265 - ACORN8x8_IDX, 266 - "Acorn8x8", 267 - 8, 268 - 8, 269 - acorndata_8x8, 265 + .idx = ACORN8x8_IDX, 266 + .name = "Acorn8x8", 267 + .width = 8, 268 + .height = 8, 269 + .data = acorndata_8x8, 270 270 #ifdef CONFIG_ARCH_ACORN 271 - 20 271 + .pref = 20, 272 272 #else 273 - 0 273 + .pref = 0, 274 274 #endif 275 275 };
+6 -6
drivers/video/console/font_mini_4x6.c
··· 2148 2148 }; 2149 2149 2150 2150 const struct font_desc font_mini_4x6 = { 2151 - MINI4x6_IDX, 2152 - "MINI4x6", 2153 - 4, 2154 - 6, 2155 - fontdata_mini_4x6, 2156 - 3 2151 + .idx = MINI4x6_IDX, 2152 + .name = "MINI4x6", 2153 + .width = 4, 2154 + .height = 6, 2155 + .data = fontdata_mini_4x6, 2156 + .pref = 3, 2157 2157 }; 2158 2158
+6 -6
drivers/video/console/font_pearl_8x8.c
··· 2578 2578 }; 2579 2579 2580 2580 const struct font_desc font_pearl_8x8 = { 2581 - PEARL8x8_IDX, 2582 - "PEARL8x8", 2583 - 8, 2584 - 8, 2585 - fontdata_pearl8x8, 2586 - 2 2581 + .idx = PEARL8x8_IDX, 2582 + .name = "PEARL8x8", 2583 + .width = 8, 2584 + .height = 8, 2585 + .data = fontdata_pearl8x8, 2586 + .pref = 2, 2587 2587 };
+7 -7
drivers/video/console/font_sun12x22.c
··· 6152 6152 6153 6153 6154 6154 const struct font_desc font_sun_12x22 = { 6155 - SUN12x22_IDX, 6156 - "SUN12x22", 6157 - 12, 6158 - 22, 6159 - fontdata_sun12x22, 6155 + .idx = SUN12x22_IDX, 6156 + .name = "SUN12x22", 6157 + .width = 12, 6158 + .height = 22, 6159 + .data = fontdata_sun12x22, 6160 6160 #ifdef __sparc__ 6161 - 5 6161 + .pref = 5, 6162 6162 #else 6163 - -1 6163 + .pref = -1, 6164 6164 #endif 6165 6165 };
+7 -7
drivers/video/console/font_sun8x16.c
··· 262 262 }; 263 263 264 264 const struct font_desc font_sun_8x16 = { 265 - SUN8x16_IDX, 266 - "SUN8x16", 267 - 8, 268 - 16, 269 - fontdata_sun8x16, 265 + .idx = SUN8x16_IDX, 266 + .name = "SUN8x16", 267 + .width = 8, 268 + .height = 16, 269 + .data = fontdata_sun8x16, 270 270 #ifdef __sparc__ 271 - 10 271 + .pref = 10, 272 272 #else 273 - -1 273 + .pref = -1, 274 274 #endif 275 275 };