Commit 2260a25c authored Apr 10, 2006 by Alessandro Zummo Committed by Linus Torvalds Apr 11, 2006

[PATCH] RTC subsystem: SA1100 cleanup



- convert printks to dev_xxx

- remove messages in excess

Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d1d65b77

drivers/rtc/rtc-sa1100.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -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,14 +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)) {
		if (IS_ERR(rtc))
		return PTR_ERR(rtc);
		}

		platform_set_drvdata(pdev, rtc);

		dev_info(&pdev->dev, "SA11xx/PXA2xx RTC Registered\n");

		return 0;
		}