From 6d2c293d6578048e7b71e0c44897144f15f350ae Mon Sep 17 00:00:00 2001 From: merging other branches Date: Wed, 26 Nov 2008 16:07:01 +0000 Subject: MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266 --- drivers/rtc/rtc-pcf50633.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'drivers/rtc/rtc-pcf50633.c') diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index bd99be1837a..00b159920b4 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -5,7 +5,7 @@ * All rights reserved. * * Broken down from monstrous PCF50633 driver mainly by - * Harald Welte and Andy Green + * Harald Welte, Andy Green and Werner Almesberger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -207,9 +207,6 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) rtc2pcf_time(&pcf_tm, &alrm->time); - printk("wkday is %x\n", alrm->time.tm_wday); - printk("wkday is %x\n", pcf_tm.time[PCF50633_TI_WKDAY]); - alarm_masked = pcf50633_irq_mask_get(pcf, PCF50633_IRQ_ALARM); /* disable alarm interrupt */ @@ -236,13 +233,13 @@ static struct rtc_class_ops pcf50633_rtc_ops = { static void pcf50633_rtc_irq(struct pcf50633 *pcf, int irq, void *unused) { - switch(irq) { - case PCF50633_IRQ_ALARM: - rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_AF | RTC_IRQF); - break; - case PCF50633_IRQ_SECOND: - rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_PF | RTC_IRQF); - break; + switch (irq) { + case PCF50633_IRQ_ALARM: + rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_AF | RTC_IRQF); + break; + case PCF50633_IRQ_SECOND: + rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_PF | RTC_IRQF); + break; } } @@ -250,12 +247,12 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; struct pcf50633 *pcf; - + rtc = rtc_device_register("pcf50633", &pdev->dev, &pcf50633_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return -ENODEV; - + pcf = platform_get_drvdata(pdev); /* Set up IRQ handlers */ @@ -263,6 +260,7 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) pcf->irq_handler[PCF50633_IRQ_SECOND].handler = pcf50633_rtc_irq; pcf->rtc.rtc_dev = rtc; + return 0; } -- cgit v1.2.3