Merge tag 'samsung-soc64-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...

[cascardo/linux.git] / drivers / rtc / rtc-mc13xxx.c

diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index a658680..30b8ef6 100644 (file)
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -250,18 +250,6 @@ static irqreturn_t mc13xxx_rtc_alarm_handler(int irq, void *dev)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t mc13xxx_rtc_update_handler(int irq, void *dev)
-{
-       struct mc13xxx_rtc *priv = dev;
-       struct mc13xxx *mc13xxx = priv->mc13xxx;
-
-       rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
-
-       mc13xxx_irq_ack(mc13xxx, irq);
-
-       return IRQ_HANDLED;
-}
-
 static const struct rtc_class_ops mc13xxx_rtc_ops = {
        .read_time = mc13xxx_rtc_read_time,
        .set_mmss64 = mc13xxx_rtc_set_mmss,
@@ -307,11 +295,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
        if (ret)
                goto err_irq_request;
 
-       ret = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_1HZ,
-                       mc13xxx_rtc_update_handler, DRIVER_NAME, priv);
-       if (ret)
-               goto err_irq_request;
-
        ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_TODA,
                        mc13xxx_rtc_alarm_handler, DRIVER_NAME, priv);
        if (ret)
@@ -326,7 +309,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
 
 err_irq_request:
        mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
-       mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);
        mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
 
        mc13xxx_unlock(mc13xxx);
@@ -341,7 +323,6 @@ static int mc13xxx_rtc_remove(struct platform_device *pdev)
        mc13xxx_lock(priv->mc13xxx);
 
        mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv);
-       mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_1HZ, priv);
        mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv);
 
        mc13xxx_unlock(priv->mc13xxx);