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

Commit 821f51c4 authored by Andrea Scian's avatar Andrea Scian Committed by Alexandre Belloni
Browse files

rtc: use rtc_valid_tm() error code when reading date/time 



There's a wrong comment in some RTC drivers that say it's better to ignore
rtc_valid_tm() when reading RTC timestamp. However this is wrong and is
better to return to the userspace the error if timestamp is not valid.

Signed-off-by: default avatarAndrea Scian <andrea.scian@dave.eu>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 4ab82103

drivers/rtc/rtc-isl12022.c

+1 −6
Original line number Diff line number Diff line
@@ -151,12 +151,7 @@ static int isl12022_get_datetime(struct i2c_client *client, struct rtc_time *tm) 
		tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);



	/* The clock can give out invalid datetime, but we cannot return

	 * -EINVAL otherwise hwclock will refuse to set the time on bootup. */

	if (rtc_valid_tm(tm) < 0)

		dev_err(&client->dev, "retrieved date and time is invalid.\n");



	return 0;

	return rtc_valid_tm(tm);

}



static int isl12022_set_datetime(struct i2c_client *client, struct rtc_time *tm)

drivers/rtc/rtc-pcf2123.c

+1 −7
Original line number Diff line number Diff line
@@ -165,13 +165,7 @@ static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm) 
			tm->tm_sec, tm->tm_min, tm->tm_hour,

			tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);



	/* the clock can give out invalid datetime, but we cannot return

	 * -EINVAL otherwise hwclock will refuse to set the time on bootup.

	 */

	if (rtc_valid_tm(tm) < 0)

		dev_err(dev, "retrieved date/time is not valid.\n");



	return 0;

	return rtc_valid_tm(tm);

}



static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)

drivers/rtc/rtc-pcf2127.c

+1 −7
Original line number Diff line number Diff line
@@ -88,13 +88,7 @@ static int pcf2127_get_datetime(struct i2c_client *client, struct rtc_time *tm) 
		tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);



	/* the clock can give out invalid datetime, but we cannot return

	 * -EINVAL otherwise hwclock will refuse to set the time on bootup.

	 */

	if (rtc_valid_tm(tm) < 0)

		dev_err(&client->dev, "retrieved date/time is not valid.\n");



	return 0;

	return rtc_valid_tm(tm);

}



static int pcf2127_set_datetime(struct i2c_client *client, struct rtc_time *tm)