diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /drivers/rtc/rtc-sa1100.c | |
parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 83b2bb480a16..a23ec54989f6 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -160,19 +160,19 @@ static int sa1100_rtc_open(struct device *dev) | |||
160 | ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT, | 160 | ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT, |
161 | "rtc 1Hz", dev); | 161 | "rtc 1Hz", dev); |
162 | if (ret) { | 162 | if (ret) { |
163 | printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTC1Hz); | 163 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); |
164 | goto fail_ui; | 164 | goto fail_ui; |
165 | } | 165 | } |
166 | ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT, | 166 | ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT, |
167 | "rtc Alrm", dev); | 167 | "rtc Alrm", dev); |
168 | if (ret) { | 168 | if (ret) { |
169 | printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_RTCAlrm); | 169 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); |
170 | goto fail_ai; | 170 | goto fail_ai; |
171 | } | 171 | } |
172 | ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT, | 172 | ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT, |
173 | "rtc timer", dev); | 173 | "rtc timer", dev); |
174 | if (ret) { | 174 | if (ret) { |
175 | printk(KERN_ERR "rtc: IRQ%d already in use.\n", IRQ_OST1); | 175 | dev_err(dev, "IRQ %d already in use.\n", IRQ_OST1); |
176 | goto fail_pi; | 176 | goto fail_pi; |
177 | } | 177 | } |
178 | return 0; | 178 | return 0; |
@@ -332,7 +332,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
332 | */ | 332 | */ |
333 | if (RTTR == 0) { | 333 | if (RTTR == 0) { |
334 | RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16); | 334 | RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16); |
335 | printk(KERN_WARNING "rtc: warning: initializing default clock divider/trim value\n"); | 335 | dev_warn(&pdev->dev, "warning: initializing default clock divider/trim value\n"); |
336 | /* The current RTC value probably doesn't make sense either */ | 336 | /* The current RTC value probably doesn't make sense either */ |
337 | RCNR = 0; | 337 | RCNR = 0; |
338 | } | 338 | } |
@@ -340,15 +340,11 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
340 | rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, | 340 | rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, |
341 | THIS_MODULE); | 341 | THIS_MODULE); |
342 | 342 | ||
343 | if (IS_ERR(rtc)) { | 343 | if (IS_ERR(rtc)) |
344 | dev_err(&pdev->dev, "Unable to register the RTC device\n"); | ||
345 | return PTR_ERR(rtc); | 344 | return PTR_ERR(rtc); |
346 | } | ||
347 | 345 | ||
348 | platform_set_drvdata(pdev, rtc); | 346 | platform_set_drvdata(pdev, rtc); |
349 | 347 | ||
350 | dev_info(&pdev->dev, "SA11xx/PXA2xx RTC Registered\n"); | ||
351 | |||
352 | return 0; | 348 | return 0; |
353 | } | 349 | } |
354 | 350 | ||