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

Commit 56d86a7e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Belloni
Browse files

rtc: simplify implementations of read_alarm 



Since commit d68778b8 ("rtc: initialize output parameter for read
alarm to "uninitialized"") there is no need to explicitly set
unsupported members to -1. So drop the respective assignments from
drivers.

Signed-off-by: default avatarUwe Kleine-König <uwe@kleine-koenig.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent e29385fa

drivers/rtc/rtc-cmos.c

+0 −3
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t) 
	 * Some also support day and month, for alarms up to a year in

	 * the future.

	 */

	t->time.tm_mday = -1;

	t->time.tm_mon = -1;



	spin_lock_irq(&rtc_lock);

	t->time.tm_sec = CMOS_READ(RTC_SECONDS_ALARM);
@@ -272,7 +270,6 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t) 
			}

		}

	}

	t->time.tm_year = -1;



	t->enabled = !!(rtc_control & RTC_AIE);

	t->pending = 0;

drivers/rtc/rtc-ds1305.c

+0 −7
Original line number Diff line number Diff line
@@ -313,13 +313,6 @@ static int ds1305_get_alarm(struct device *dev, struct rtc_wkalrm *alm) 
	alm->time.tm_sec = bcd2bin(buf[DS1305_SEC]);

	alm->time.tm_min = bcd2bin(buf[DS1305_MIN]);

	alm->time.tm_hour = bcd2hour(buf[DS1305_HOUR]);

	alm->time.tm_mday = -1;

	alm->time.tm_mon = -1;

	alm->time.tm_year = -1;

	/* next three fields are unused by Linux */

	alm->time.tm_wday = -1;

	alm->time.tm_mday = -1;

	alm->time.tm_isdst = -1;



	return 0;

}

drivers/rtc/rtc-ds1307.c

+0 −5
Original line number Diff line number Diff line
@@ -482,11 +482,6 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t) 
	t->time.tm_min = bcd2bin(ds1307->regs[1] & 0x7f);

	t->time.tm_hour = bcd2bin(ds1307->regs[2] & 0x3f);

	t->time.tm_mday = bcd2bin(ds1307->regs[3] & 0x3f);

	t->time.tm_mon = -1;

	t->time.tm_year = -1;

	t->time.tm_wday = -1;

	t->time.tm_yday = -1;

	t->time.tm_isdst = -1;



	/* ... and status */

	t->enabled = !!(ds1307->regs[7] & DS1337_BIT_A1IE);

drivers/rtc/rtc-ds1343.c

+0 −6
Original line number Diff line number Diff line
@@ -504,12 +504,6 @@ static int ds1343_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) 
	alarm->time.tm_hour = priv->alarm_hour < 0 ? 0 : priv->alarm_hour;

	alarm->time.tm_mday = priv->alarm_mday < 0 ? 0 : priv->alarm_mday;



	alarm->time.tm_mon = -1;

	alarm->time.tm_year = -1;

	alarm->time.tm_wday = -1;

	alarm->time.tm_yday = -1;

	alarm->time.tm_isdst = -1;



out:

	mutex_unlock(&priv->mutex);

	return res;

drivers/rtc/rtc-ds1685.c

+4 −15
Original line number Diff line number Diff line
@@ -419,25 +419,19 @@ ds1685_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	 *

	 * The Linux RTC system doesn't support the "don't care" capability

	 * of this RTC chip.  We check for it anyways in case support is

	 * added in the future.

	 * added in the future and only assign when we care.

	 */

	if (unlikely(seconds >= 0xc0))

		alrm->time.tm_sec = -1;

	else

	if (likely(seconds < 0xc0))

		alrm->time.tm_sec = ds1685_rtc_bcd2bin(rtc, seconds,

						       RTC_SECS_BCD_MASK,

						       RTC_SECS_BIN_MASK);



	if (unlikely(minutes >= 0xc0))

		alrm->time.tm_min = -1;

	else

	if (likely(minutes < 0xc0))

		alrm->time.tm_min = ds1685_rtc_bcd2bin(rtc, minutes,

						       RTC_MINS_BCD_MASK,

						       RTC_MINS_BIN_MASK);



	if (unlikely(hours >= 0xc0))

		alrm->time.tm_hour = -1;

	else

	if (likely(hours < 0xc0))

		alrm->time.tm_hour = ds1685_rtc_bcd2bin(rtc, hours,

							RTC_HRS_24_BCD_MASK,

							RTC_HRS_24_BIN_MASK);
@@ -445,11 +439,6 @@ ds1685_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	/* Write the data to rtc_wkalrm. */

	alrm->time.tm_mday = ds1685_rtc_bcd2bin(rtc, mday, RTC_MDAY_BCD_MASK,

						RTC_MDAY_BIN_MASK);

	alrm->time.tm_mon = -1;

	alrm->time.tm_year = -1;

	alrm->time.tm_wday = -1;

	alrm->time.tm_yday = -1;

	alrm->time.tm_isdst = -1;

	alrm->enabled = !!(ctrlb & RTC_CTRL_B_AIE);

	alrm->pending = !!(ctrlc & RTC_CTRL_C_AF);