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

Commit 473b8645 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

rtc: use c99 initializers in structures 

Use c99 initializers for structures.

A simplified version of the semantic match that finds this 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>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87d672cb

drivers/rtc/rtc-pcf8583.c

+15 −3
Original line number Diff line number Diff line
@@ -176,7 +176,11 @@ static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm) 
{

	struct i2c_client *client = to_i2c_client(dev);

	unsigned char ctrl, year[2];

	struct rtc_mem mem = { CMOS_YEAR, sizeof(year), year };

	struct rtc_mem mem = {

		.loc = CMOS_YEAR,

		.nr = sizeof(year),

		.data = year

	};

	int real_year, year_offset, err;



	/*
@@ -222,8 +226,16 @@ static int pcf8583_rtc_set_time(struct device *dev, struct rtc_time *tm) 
{

	struct i2c_client *client = to_i2c_client(dev);

	unsigned char year[2], chk;

	struct rtc_mem cmos_year  = { CMOS_YEAR, sizeof(year), year };

	struct rtc_mem cmos_check = { CMOS_CHECKSUM, 1, &chk };

	struct rtc_mem cmos_year  = {

		.loc = CMOS_YEAR,

		.nr = sizeof(year),

		.data = year

	};

	struct rtc_mem cmos_check = {

		.loc = CMOS_CHECKSUM,

		.nr = 1,

		.data = &chk

	};

	unsigned int proper_year = tm->tm_year + 1900;

	int ret;