diff options
author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-03-20 08:32:31 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-04-04 04:07:08 -0400 |
commit | 9a842a7ebb169c2a8d8b9a3489d8cacfc235f6bf (patch) | |
tree | 819f3253fe3ba40580aad38cbf45b1732fb3c080 | |
parent | db7853414b3eb8fbd16017edd3d60e6f717170ff (diff) |
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>
-rw-r--r-- | drivers/rtc/rtc-xgene.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-xgene.c b/drivers/rtc/rtc-xgene.c index eb745deda936..6f7d7648a9bd 100644 --- a/drivers/rtc/rtc-xgene.c +++ b/drivers/rtc/rtc-xgene.c | |||
@@ -35,7 +35,6 @@ | |||
35 | struct xgene_rtc_dev { | 35 | struct xgene_rtc_dev { |
36 | struct rtc_device *rtc; | 36 | struct rtc_device *rtc; |
37 | struct device *dev; | 37 | struct device *dev; |
38 | unsigned long alarm_time; | ||
39 | void __iomem *csr_base; | 38 | void __iomem *csr_base; |
40 | struct clk *clk; | 39 | struct clk *clk; |
41 | unsigned int irq_wake; | 40 | unsigned int irq_wake; |
@@ -68,7 +67,8 @@ static int xgene_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
68 | { | 67 | { |
69 | struct xgene_rtc_dev *pdata = dev_get_drvdata(dev); | 68 | struct xgene_rtc_dev *pdata = dev_get_drvdata(dev); |
70 | 69 | ||
71 | rtc_time_to_tm(pdata->alarm_time, &alrm->time); | 70 | /* If possible, CMR should be read here */ |
71 | rtc_time_to_tm(0, &alrm->time); | ||
72 | alrm->enabled = readl(pdata->csr_base + RTC_CCR) & RTC_CCR_IE; | 72 | alrm->enabled = readl(pdata->csr_base + RTC_CCR) & RTC_CCR_IE; |
73 | 73 | ||
74 | return 0; | 74 | return 0; |
@@ -105,8 +105,7 @@ static int xgene_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
105 | unsigned long alarm_time; | 105 | unsigned long alarm_time; |
106 | 106 | ||
107 | rtc_tm_to_time(&alrm->time, &alarm_time); | 107 | rtc_tm_to_time(&alrm->time, &alarm_time); |
108 | pdata->alarm_time = alarm_time; | 108 | writel((u32)alarm_time, pdata->csr_base + RTC_CMR); |
109 | writel((u32)pdata->alarm_time, pdata->csr_base + RTC_CMR); | ||
110 | 109 | ||
111 | xgene_rtc_alarm_irq_enable(dev, alrm->enabled); | 110 | xgene_rtc_alarm_irq_enable(dev, alrm->enabled); |
112 | 111 | ||