From 4b8dd1934f4af9e3e8672695ccf5f5433da79d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 5 Mar 2010 13:44:28 -0800 Subject: [PATCH] --- yaml --- r: 186332 b: refs/heads/master c: 4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-mc13783.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index aeffd3d7e836..8a93b2f39bff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a83319182afe9ba7d958180b3bd3a32a9e3d1be +refs/heads/master: 4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319 diff --git a/trunk/drivers/rtc/rtc-mc13783.c b/trunk/drivers/rtc/rtc-mc13783.c index 850f983c039c..0a978a0e40fc 100644 --- a/trunk/drivers/rtc/rtc-mc13783.c +++ b/trunk/drivers/rtc/rtc-mc13783.c @@ -101,11 +101,11 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) if (unlikely(ret)) goto out; - ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST); + ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST); if (unlikely(ret)) goto out; - ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST); + ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST); out: priv->valid = !ret; @@ -123,7 +123,7 @@ static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev) rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF); - mc13783_ackirq(mc13783, irq); + mc13783_irq_ack(mc13783, irq); return IRQ_HANDLED; } @@ -138,7 +138,7 @@ static int mc13783_rtc_update_irq_enable(struct device *dev, if (!priv->valid) goto out; - ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783, + ret = (enabled ? mc13783_irq_unmask : mc13783_irq_mask)(priv->mc13783, MC13783_IRQ_1HZ); out: mc13783_unlock(priv->mc13783); @@ -160,7 +160,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev) dev_dbg(&priv->rtc->dev, "RTCRST\n"); priv->valid = 0; - mc13783_mask(mc13783, irq); + mc13783_irq_mask(mc13783, irq); return IRQ_HANDLED; }