Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 41 deletions

diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index 16edf94ab42f..0c423892923c 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -58,7 +58,6 @@ struct pcf50633_time {
 
 struct pcf50633_rtc {
         int alarm_enabled;
-        int second_enabled;
         int alarm_pending;
 
         struct pcf50633 *pcf;
@@ -106,25 +105,6 @@ pcf50633_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
         return 0;
 }
 
-static int
-pcf50633_rtc_update_irq_enable(struct device *dev, unsigned int enabled)
-{
-        struct pcf50633_rtc *rtc = dev_get_drvdata(dev);
-        int err;
-
-        if (enabled)
-                err = pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
-        else
-                err = pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
-
-        if (err < 0)
-                return err;
-
-        rtc->second_enabled = enabled;
-
-        return 0;
-}
-
 static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
         struct pcf50633_rtc *rtc;
@@ -162,7 +142,7 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         struct pcf50633_rtc *rtc;
         struct pcf50633_time pcf_tm;
-        int second_masked, alarm_masked, ret = 0;
+        int alarm_masked, ret = 0;
 
         rtc = dev_get_drvdata(dev);
 
@@ -181,11 +161,8 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
                 pcf_tm.time[PCF50633_TI_SEC]);
 
 
-        second_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_SECOND);
         alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM);
 
-        if (!second_masked)
-                pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
         if (!alarm_masked)
                 pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
 
@@ -194,8 +171,6 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
                                              PCF50633_TI_EXTENT,
                                              &pcf_tm.time[0]);
 
-        if (!second_masked)
-                pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
         if (!alarm_masked)
                 pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
 
@@ -262,23 +237,15 @@ static struct rtc_class_ops pcf50633_rtc_ops = {
         .set_time               = pcf50633_rtc_set_time,
         .read_alarm             = pcf50633_rtc_read_alarm,
         .set_alarm              = pcf50633_rtc_set_alarm,
-        .alarm_irq_enable       = pcf50633_rtc_alarm_irq_enable,
-        .update_irq_enable      = pcf50633_rtc_update_irq_enable,
+        .alarm_irq_enable       = pcf50633_rtc_alarm_irq_enable,
 };
 
 static void pcf50633_rtc_irq(int irq, void *data)
 {
         struct pcf50633_rtc *rtc = data;
 
-        switch (irq) {
-        case PCF50633_IRQ_ALARM:
-                rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
-                rtc->alarm_pending = 1;
-                break;
-        case PCF50633_IRQ_SECOND:
-                rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
-                break;
-        }
+        rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
+        rtc->alarm_pending = 1;
 }
 
 static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
@@ -302,9 +269,6 @@ static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
 
         pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
                                         pcf50633_rtc_irq, rtc);
-        pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_SECOND,
-                                        pcf50633_rtc_irq, rtc);
-
         return 0;
 }
 
@@ -315,7 +279,6 @@ static int __devexit pcf50633_rtc_remove(struct platform_device *pdev)
         rtc = platform_get_drvdata(pdev);
 
         pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
-        pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_SECOND);
 
         rtc_device_unregister(rtc->rtc_dev);
         kfree(rtc);