Merge ../linus

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-sa1100.c

diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 83b2bb480a16da8586d67fc1275499efc8a82d94..a23ec54989f6dbad436d1d91397b542511136346 100644 (file)
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -160,19 +160,19 @@ static int sa1100_rtc_open(struct device *dev)
        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT,
                                "rtc 1Hz", dev);
        if (ret) {
-               printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTC1Hz);
+               dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
                goto fail_ui;
        }
        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT,
                                "rtc Alrm", dev);
        if (ret) {
-               printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTCAlrm);
+               dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
                goto fail_ai;
        }
        ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT,
                                "rtc timer", dev);
        if (ret) {
-               printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_OST1);
+               dev_err(dev, "IRQ %d already in use.\n", IRQ_OST1);
                goto fail_pi;
        }
        return 0;
@@ -332,7 +332,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
         */
        if (RTTR == 0) {
                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-               printk(KERN_WARNING "rtc: warning: initializing default clock divider/trim value\n");
+               dev_warn(&pdev->dev, "warning: initializing default clock divider/trim value\n");
                /* The current RTC value probably doesn't make sense either */
                RCNR = 0;
        }
@@ -340,15 +340,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
        rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
                                THIS_MODULE);
 
-       if (IS_ERR(rtc)) {
-               dev_err(&pdev->dev, "Unable to register the RTC device\n");
+       if (IS_ERR(rtc))
                return PTR_ERR(rtc);
-       }
 
        platform_set_drvdata(pdev, rtc);
 
-       dev_info(&pdev->dev, "SA11xx/PXA2xx RTC Registered\n");
-
        return 0;
 }