Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908633f3 authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

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: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad41b439

drivers/video/console/font_10x18.c

+7 −7
Original line number Diff line number Diff line
@@ -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

};

drivers/video/console/font_6x11.c

+7 −6
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/console/font_7x14.c

+6 −6
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/console/font_8x16.c

+6 −6
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/console/font_8x8.c

+6 −6
Original line number Diff line number Diff line
@@ -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,

};