diff options
| -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) | |||
| 101 | if (unlikely(ret)) | 101 | if (unlikely(ret)) |
| 102 | goto out; | 102 | goto out; |
| 103 | 103 | ||
| 104 | ret = mc13783_ackirq(priv->mc13783, MC13783_IRQ_RTCRST); | 104 | ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST); |
| 105 | if (unlikely(ret)) | 105 | if (unlikely(ret)) |
| 106 | goto out; | 106 | goto out; |
| 107 | 107 | ||
| 108 | ret = mc13783_unmask(priv->mc13783, MC13783_IRQ_RTCRST); | 108 | ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST); |
| 109 | out: | 109 | out: |
| 110 | priv->valid = !ret; | 110 | priv->valid = !ret; |
| 111 | 111 | ||
| @@ -123,7 +123,7 @@ static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev) | |||
| 123 | 123 | ||
| 124 | rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF); | 124 | rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF); |
| 125 | 125 | ||
| 126 | mc13783_ackirq(mc13783, irq); | 126 | mc13783_irq_ack(mc13783, irq); |
| 127 | 127 | ||
| 128 | return IRQ_HANDLED; | 128 | return IRQ_HANDLED; |
| 129 | } | 129 | } |
| @@ -138,7 +138,7 @@ static int mc13783_rtc_update_irq_enable(struct device *dev, | |||
| 138 | if (!priv->valid) | 138 | if (!priv->valid) |
| 139 | goto out; | 139 | goto out; |
| 140 | 140 | ||
| 141 | ret = (enabled ? mc13783_unmask : mc13783_mask)(priv->mc13783, | 141 | ret = (enabled ? mc13783_irq_unmask : mc13783_irq_mask)(priv->mc13783, |
| 142 | MC13783_IRQ_1HZ); | 142 | MC13783_IRQ_1HZ); |
| 143 | out: | 143 | out: |
| 144 | mc13783_unlock(priv->mc13783); | 144 | mc13783_unlock(priv->mc13783); |
| @@ -160,7 +160,7 @@ static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev) | |||
| 160 | dev_dbg(&priv->rtc->dev, "RTCRST\n"); | 160 | dev_dbg(&priv->rtc->dev, "RTCRST\n"); |
| 161 | priv->valid = 0; | 161 | priv->valid = 0; |
| 162 | 162 | ||
| 163 | mc13783_mask(mc13783, irq); | 163 | mc13783_irq_mask(mc13783, irq); |
| 164 | 164 | ||
| 165 | return IRQ_HANDLED; | 165 | return IRQ_HANDLED; |
| 166 | } | 166 | } |
