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

Commit d456ea2e authored by Julia Lawall's avatar Julia Lawall Committed by Daniel Vetter
Browse files

drm: use c99 initializers in structures 

Use c99 initializers for structures.

Drop 0 initializers in drivers/gpu/drm/sti/sti_vtac.c.  A 0x0 initializer
is left in vtac_mode_aux in drivers/gpu/drm/sti/sti_vtac.c to highlight the
relation to vtac_mode_main.

A simplified version of the semantic match that finds the first problem is
as follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@decl@
identifier i1,fld;
type T;
field list[n] fs;
@@

struct i1 {
 fs
 T fld;
 ...};

@bad@
identifier decl.i1,i2;
expression e;
initializer list[decl.n] is;
@@

struct i1 i2 = { is,
+ .fld = e
- e
 ,...};
// </smpl>

v2: Drop 0 initializers and add trailing commas at the suggestions of Josh
Triplett.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f3a80881

drivers/gpu/drm/drm_edid.c

+12 −9
Original line number Diff line number Diff line
@@ -2103,7 +2103,8 @@ static int 
add_inferred_modes(struct drm_connector *connector, struct edid *edid)

{

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	if (version_greater(edid, 1, 0))
@@ -2169,7 +2170,8 @@ add_established_modes(struct drm_connector *connector, struct edid *edid) 
		((edid->established_timings.mfg_rsvd & 0x80) << 9);

	int i, modes = 0;

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	for (i = 0; i <= EDID_EST_TIMINGS; i++) {
@@ -2227,7 +2229,8 @@ add_standard_modes(struct drm_connector *connector, struct edid *edid) 
{

	int i, modes = 0;

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	for (i = 0; i < EDID_STD_TIMINGS; i++) {
@@ -2313,7 +2316,8 @@ static int 
add_cvt_modes(struct drm_connector *connector, struct edid *edid)

{	

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	if (version_greater(edid, 1, 2))
@@ -2357,11 +2361,10 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
		   u32 quirks)

{

	struct detailed_mode_closure closure = {

		connector,

		edid,

		1,

		quirks,

		0

		.connector = connector,

		.edid = edid,

		.preferred = 1,

		.quirks = quirks,

	};



	if (closure.preferred && !version_greater(edid, 1, 3))

drivers/gpu/drm/sti/sti_vtac.c

+10 −2
Original line number Diff line number Diff line
@@ -56,8 +56,16 @@ struct sti_vtac_mode { 
	u32 phyts_per_pixel;

};



static const struct sti_vtac_mode vtac_mode_main = {0x2, 0x2, VTAC_5_PPP};

static const struct sti_vtac_mode vtac_mode_aux = {0x1, 0x0, VTAC_17_PPP};

static const struct sti_vtac_mode vtac_mode_main = {

	.vid_in_width = 0x2,

	.phyts_width = 0x2,

	.phyts_per_pixel = VTAC_5_PPP,

};

static const struct sti_vtac_mode vtac_mode_aux = {

	.vid_in_width = 0x1,

	.phyts_width = 0x0,

	.phyts_per_pixel = VTAC_17_PPP,

};



/**

 * VTAC structure