Commit 4dd4dd65 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Torvalds

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: default avatarUwe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a833191
...@@ -101,11 +101,11 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) ...@@ -101,11 +101,11 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST); ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST); ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST);
out: out:
priv->valid = !ret; priv->valid = !ret;
...@@ -123,7 +123,7 @@ static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev) ...@@ -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); rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
mc13783_ackirq(mc13783, irq); mc13783_irq_ack(mc13783, irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -138,7 +138,7 @@ static int mc13783_rtc_update_irq_enable(struct device *dev, ...@@ -138,7 +138,7 @@ static int mc13783_rtc_update_irq_enable(struct device *dev,
if (!priv->valid) if (!priv->valid)
goto out; goto out;
ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783, ret = (enabled ? mc13783_irq_unmask : mc13783_irq_mask)(priv->mc13783,
MC13783_IRQ_1HZ); MC13783_IRQ_1HZ);
out: out:
mc13783_unlock(priv->mc13783); mc13783_unlock(priv->mc13783);
...@@ -160,7 +160,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev) ...@@ -160,7 +160,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev)
dev_dbg(&priv->rtc->dev, "RTCRST\n"); dev_dbg(&priv->rtc->dev, "RTCRST\n");
priv->valid = 0; priv->valid = 0;
mc13783_mask(mc13783, irq); mc13783_irq_mask(mc13783, irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment