* [PATCH] rtc: rtc-s3c: Fix type mismatch of alarm_irq_enable
@ 2010-11-02 1:52 Kyungmin Park
0 siblings, 0 replies; only message in thread
From: Kyungmin Park @ 2010-11-02 1:52 UTC (permalink / raw)
To: Alessandro Zummo, rtc-linux, linux-kernel
From: Kyungmin Park <kyungmin.park@samsung.com>
Fix type mismatch of alarm_irq_enable
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/rtc/rtc-s3c.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index cf953ec..4101522 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -77,7 +77,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
}
/* Update control registers */
-static void s3c_rtc_setaie(int to)
+static int s3c_rtc_setaie(struct device *dev, unsigned int to)
{
unsigned int tmp;
@@ -89,6 +89,8 @@ static void s3c_rtc_setaie(int to)
tmp |= S3C2410_RTCALM_ALMEN;
writeb(tmp, s3c_rtc_base + S3C2410_RTCALM);
+
+ return 0;
}
static int s3c_rtc_setpie(struct device *dev, int enabled)
@@ -308,7 +310,7 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
writeb(alrm_en, base + S3C2410_RTCALM);
- s3c_rtc_setaie(alrm->enabled);
+ s3c_rtc_setaie(dev, alrm->enabled);
return 0;
}
@@ -440,7 +442,7 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
rtc_device_unregister(rtc);
s3c_rtc_setpie(&dev->dev, 0);
- s3c_rtc_setaie(0);
+ s3c_rtc_setaie(&dev->dev, 0);
clk_disable(rtc_clk);
clk_put(rtc_clk);
--
1.5.3.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-02 1:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-02 1:52 [PATCH] rtc: rtc-s3c: Fix type mismatch of alarm_irq_enable Kyungmin Park
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox