diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-03-05 13:44:28 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:26:47 -0800 |
| commit | 4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319 (patch) | |
| tree | 1eacde57ca86d1337faf65cb4e527c79ad40049d /drivers/rtc | |
| parent | input/mc13783-ts: don't use deprecated mc13783 API calls (diff) | |
| download | linux-dev-4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319.tar.xz linux-dev-4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319.zip | |
rtc/mc13783: don't use deprecated mc13783 API calls
mc13783_ackirq, mc13783_unmask and mc13783_mask are deprecated, use the
drop in replacements with the nicer names.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-mc13783.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-mc13783.c b/drivers/rtc/rtc-mc13783.c index 850f983c039c..0a978a0e40fc 100644 --- a/drivers/rtc/rtc-mc13783.c +++ b/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; } |