openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: xgene: stop caching alarm_time 

There is no point in caching alarm_time for .read_alarm because
.read_alarm is only called at boo time and thus alarm_time is always 0.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni 2019-03-20 13:32:31 +01:00
parent db7853414b
commit 9a842a7ebb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/rtc/rtc-xgene.c
View File

@ -35,7 +35,6 @@
struct xgene_rtc_dev { struct xgene_rtc_dev {
struct rtc_device *rtc; struct rtc_device *rtc;
struct device *dev; struct device *dev;
unsigned long alarm_time;
void __iomem *csr_base; void __iomem *csr_base;
struct clk *clk; struct clk *clk;
unsigned int irq_wake; unsigned int irq_wake;
@ -68,7 +67,8 @@ static int xgene_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
{ {
struct xgene_rtc_dev *pdata = dev_get_drvdata(dev); struct xgene_rtc_dev *pdata = dev_get_drvdata(dev);
rtc_time_to_tm(pdata->alarm_time, &alrm->time); /* If possible, CMR should be read here */
rtc_time_to_tm(0, &alrm->time);
alrm->enabled = readl(pdata->csr_base + RTC_CCR) & RTC_CCR_IE; alrm->enabled = readl(pdata->csr_base + RTC_CCR) & RTC_CCR_IE;
return 0; return 0;
@ -105,8 +105,7 @@ static int xgene_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
unsigned long alarm_time; unsigned long alarm_time;
rtc_tm_to_time(&alrm->time, &alarm_time); rtc_tm_to_time(&alrm->time, &alarm_time);
pdata->alarm_time = alarm_time; writel((u32)alarm_time, pdata->csr_base + RTC_CMR);
writel((u32)pdata->alarm_time, pdata->csr_base + RTC_CMR);
xgene_rtc_alarm_irq_enable(dev, alrm->enabled); xgene_rtc_alarm_irq_enable(dev, alrm->enabled);