Commit 3b45cc52 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: 88pm860x: stop mangling alarm time 

The RTC core always passes a valid alarm time there is no need to modify
it.

Link: https://lore.kernel.org/r/20200311223956.51352-5-alexandre.belloni@bootlin.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent a3e49371

drivers/rtc/rtc-88pm860x.c

+1 −40
Original line number Diff line number Diff line
@@ -75,33 +75,6 @@ static int pm860x_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) 
	return 0;

}



/*

 * Calculate the next alarm time given the requested alarm time mask

 * and the current time.

 */

static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,

				struct rtc_time *alrm)

{

	unsigned long next_time;

	unsigned long now_time;



	next->tm_year = now->tm_year;

	next->tm_mon = now->tm_mon;

	next->tm_mday = now->tm_mday;

	next->tm_hour = alrm->tm_hour;

	next->tm_min = alrm->tm_min;

	next->tm_sec = alrm->tm_sec;



	rtc_tm_to_time(now, &now_time);

	rtc_tm_to_time(next, &next_time);



	if (next_time < now_time) {

		/* Advance one day */

		next_time += 60 * 60 * 24;

		rtc_time_to_tm(next_time, next);

	}

}



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

{

	struct pm860x_rtc_info *info = dev_get_drvdata(dev);
@@ -187,7 +160,6 @@ static int pm860x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
static int pm860x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)

{

	struct pm860x_rtc_info *info = dev_get_drvdata(dev);

	struct rtc_time now_tm, alarm_tm;

	unsigned long ticks, base, data;

	unsigned char buf[8];

	int mask;
@@ -200,18 +172,7 @@ static int pm860x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	base = ((unsigned long)buf[1] << 24) | (buf[3] << 16) |

		(buf[5] << 8) | buf[7];



	/* load 32-bit read-only counter */

	pm860x_bulk_read(info->i2c, PM8607_RTC_COUNTER1, 4, buf);

	data = ((unsigned long)buf[3] << 24) | (buf[2] << 16) |

		(buf[1] << 8) | buf[0];

	ticks = base + data;

	dev_dbg(info->dev, "get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n",

		base, data, ticks);



	rtc_time_to_tm(ticks, &now_tm);

	rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time);

	/* get new ticks for alarm in 24 hours */

	rtc_tm_to_time(&alarm_tm, &ticks);

	rtc_tm_to_time(&alrm->time, &ticks);

	data = ticks - base;



	buf[0] = data & 0xff;