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>

diff --git a/drivers/video/console/font_10x18.c b/drivers/video/console/font_10x18.c
index e6aa0eab5bb6b464c95b124d952fb52e5774c887..6be72bb218ee4d65e95ad6377b56d6ee5038e88f 100644 (file)
--- a/drivers/video/console/font_10x18.c
+++ b/drivers/video/console/font_10x18.c
@@ -5133,14 +5133,14 @@ static const unsigned char fontdata_10x18[FONTDATAMAX] = {
 
 
 const struct font_desc font_10x18 = {
-       FONT10x18_IDX,
-       "10x18",
-       10,
-       18,
-       fontdata_10x18,
+       .idx    = FONT10x18_IDX,
+       .name   = "10x18",
+       .width  = 10,
+       .height = 18,
+       .data   = fontdata_10x18,
 #ifdef __sparc__
-       5
+       .pref   = 5,
 #else
-       -1
+       .pref   = -1,
 #endif
 };

diff --git a/drivers/video/console/font_6x11.c b/drivers/video/console/font_6x11.c
index 89976cd97494eb74fbc059b2af9faf8f99cfa00a..46e86e67aa6aa8d1411c25403864064bab43adc4 100644 (file)
--- a/drivers/video/console/font_6x11.c
+++ b/drivers/video/console/font_6x11.c
@@ -3342,10 +3342,11 @@ static const unsigned char fontdata_6x11[FONTDATAMAX] = {
 
 
 const struct font_desc font_vga_6x11 = {
-       VGA6x11_IDX,
-       "ProFont6x11",
-       6,
-       11,
-       fontdata_6x11,
-       -2000   /* Try avoiding this font if possible unless on MAC */
+       .idx    = VGA6x11_IDX,
+       .name   = "ProFont6x11",
+       .width  = 6,
+       .height = 11,
+       .data   = fontdata_6x11,
+       /* Try avoiding this font if possible unless on MAC */
+       .pref   = -2000,
 };

diff --git a/drivers/video/console/font_7x14.c b/drivers/video/console/font_7x14.c
index bbf1166473972a4410638669d85ad30d1a7daf25..3b7dbf9c060b33eb55d33938ec13c4cfeab03fe9 100644 (file)
--- a/drivers/video/console/font_7x14.c
+++ b/drivers/video/console/font_7x14.c
@@ -4109,10 +4109,10 @@ static const unsigned char fontdata_7x14[FONTDATAMAX] = {
 
 
 const struct font_desc font_7x14 = {
-       FONT7x14_IDX,
-       "7x14",
-       7,
-       14,
-       fontdata_7x14,
-       0
+       .idx    = FONT7x14_IDX,
+       .name   = "7x14",
+       .width  = 7,
+       .height = 14,
+       .data   = fontdata_7x14,
+       .pref   = 0,
 };

diff --git a/drivers/video/console/font_8x16.c b/drivers/video/console/font_8x16.c
index 74fe86f28ff4644447476a4d701f61d3ab6b5b3a..a9f35b4a08045960b6114a61d89fec62ee1c2a10 100644 (file)
--- a/drivers/video/console/font_8x16.c
+++ b/drivers/video/console/font_8x16.c
@@ -4622,10 +4622,10 @@ static const unsigned char fontdata_8x16[FONTDATAMAX] = {
 
 
 const struct font_desc font_vga_8x16 = {
-       VGA8x16_IDX,
-       "VGA8x16",
-       8,
-       16,
-       fontdata_8x16,
-       0
+       .idx    = VGA8x16_IDX,
+       .name   = "VGA8x16",
+       .width  = 8,
+       .height = 16,
+       .data   = fontdata_8x16,
+       .pref   = 0,
 };

diff --git a/drivers/video/console/font_8x8.c b/drivers/video/console/font_8x8.c
index 26199f8ee908103f0065eb12068832e4bf6f61f4..9f56efe2cee728ffb075c64d9419b093bf66c4f4 100644 (file)
--- a/drivers/video/console/font_8x8.c
+++ b/drivers/video/console/font_8x8.c
@@ -2574,10 +2574,10 @@ static const unsigned char fontdata_8x8[FONTDATAMAX] = {
 
 
 const struct font_desc font_vga_8x8 = {
-       VGA8x8_IDX,
-       "VGA8x8",
-       8,
-       8,
-       fontdata_8x8,
-       0
+       .idx    = VGA8x8_IDX,
+       .name   = "VGA8x8",
+       .width  = 8,
+       .height = 8,
+       .data   = fontdata_8x8,
+       .pref   = 0,
 };

diff --git a/drivers/video/console/font_acorn_8x8.c b/drivers/video/console/font_acorn_8x8.c
index 40f3d4eeb1980256aafd9bb506c2b8d90b51de6b..639e31ae1100ae5511948e6a538b1cbdb75b62e7 100644 (file)
--- a/drivers/video/console/font_acorn_8x8.c
+++ b/drivers/video/console/font_acorn_8x8.c
@@ -262,14 +262,14 @@ static const unsigned char acorndata_8x8[] = {
 };
 
 const struct font_desc font_acorn_8x8 = {
-       ACORN8x8_IDX,
-       "Acorn8x8",
-       8,
-       8,
-       acorndata_8x8,
+       .idx    = ACORN8x8_IDX,
+       .name   = "Acorn8x8",
+       .width  = 8,
+       .height = 8,
+       .data   = acorndata_8x8,
 #ifdef CONFIG_ARCH_ACORN
-       20
+       .pref   = 20,
 #else
-       0
+       .pref   = 0,
 #endif
 };

diff --git a/drivers/video/console/font_mini_4x6.c b/drivers/video/console/font_mini_4x6.c
index d818234fdf11e760b9dfb26c2df18259e0b06da9..a19a7f33133e80e995e004c6b1a74486c8e4fb6e 100644 (file)
--- a/drivers/video/console/font_mini_4x6.c
+++ b/drivers/video/console/font_mini_4x6.c
@@ -2148,11 +2148,11 @@ static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = {
 };
 
 const struct font_desc font_mini_4x6 = {
-       MINI4x6_IDX,
-       "MINI4x6",
-       4,
-       6,
-       fontdata_mini_4x6,
-       3
+       .idx    = MINI4x6_IDX,
+       .name   = "MINI4x6",
+       .width  = 4,
+       .height = 6,
+       .data   = fontdata_mini_4x6,
+       .pref   = 3,
 };
 

diff --git a/drivers/video/console/font_pearl_8x8.c b/drivers/video/console/font_pearl_8x8.c
index e646c88f55c7b245c98cc19f1350ec49f3a78d74..dc6ad539ca4e4307c321e4d5b2e374814f04d707 100644 (file)
--- a/drivers/video/console/font_pearl_8x8.c
+++ b/drivers/video/console/font_pearl_8x8.c
@@ -2578,10 +2578,10 @@ static const unsigned char fontdata_pearl8x8[FONTDATAMAX] = {
 };
 
 const struct font_desc font_pearl_8x8 = {
-       PEARL8x8_IDX,
-       "PEARL8x8",
-       8,
-       8,
-       fontdata_pearl8x8,
-       2
+       .idx    = PEARL8x8_IDX,
+       .name   = "PEARL8x8",
+       .width  = 8,
+       .height = 8,
+       .data   = fontdata_pearl8x8,
+       .pref   = 2,
 };

diff --git a/drivers/video/console/font_sun12x22.c b/drivers/video/console/font_sun12x22.c
index ab5eb93407b4c9820f6851531c4d181439990f13..d3643853c33af91dd98883d9f0c8b8565a70f5a6 100644 (file)
--- a/drivers/video/console/font_sun12x22.c
+++ b/drivers/video/console/font_sun12x22.c
@@ -6152,14 +6152,14 @@ static const unsigned char fontdata_sun12x22[FONTDATAMAX] = {
 
 
 const struct font_desc font_sun_12x22 = {
-       SUN12x22_IDX,
-       "SUN12x22",
-       12,
-       22,
-       fontdata_sun12x22,
+       .idx    = SUN12x22_IDX,
+       .name   = "SUN12x22",
+       .width  = 12,
+       .height = 22,
+       .data   = fontdata_sun12x22,
 #ifdef __sparc__
-       5
+       .pref   = 5,
 #else
-       -1
+       .pref   = -1,
 #endif
 };

diff --git a/drivers/video/console/font_sun8x16.c b/drivers/video/console/font_sun8x16.c
index 41f910f5529c95ebc83493f2f92e72dc82413a18..5abf290c6eb76fbd8e2c3c91f5d229b3c409b59d 100644 (file)
--- a/drivers/video/console/font_sun8x16.c
+++ b/drivers/video/console/font_sun8x16.c
@@ -262,14 +262,14 @@ static const unsigned char fontdata_sun8x16[FONTDATAMAX] = {
 };
 
 const struct font_desc font_sun_8x16 = {
-       SUN8x16_IDX,
-       "SUN8x16",
-       8,
-       16,
-       fontdata_sun8x16,
+       .idx    = SUN8x16_IDX,
+       .name   = "SUN8x16",
+       .width  = 8,
+       .height = 16,
+       .data   = fontdata_sun8x16,
 #ifdef __sparc__
-       10
+       .pref   = 10,
 #else
-       -1
+       .pref   = -1,
 #endif
 };