rtc: bunch of drivers: fix 'no irq' case handing

This patch fixes a bunch of irq checking misuses.  Most drivers were
getting irq via platform_get_irq(), which returns -ENXIO or r->start.

rtc-cmos.c is special.  It is using PNP and platform bindings.  Hopefully
nobody is using PNP IRQ 0 for RTC.  So the changes should be safe.

rtc-sh.c is using platform_get_irq, but was storing a result into an
unsigned type, then was checking for < 0.  This is fixed now.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index aaf9d6a337cc..5ed66acf8ca5 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -89,7 +89,9 @@ struct sh_rtc {
         void __iomem *regbase;
         unsigned long regsize;
         struct resource *res;
-        unsigned int alarm_irq, periodic_irq, carry_irq;
+        int alarm_irq;
+        int periodic_irq;
+        int carry_irq;
         struct rtc_device *rtc_dev;
         spinlock_t lock;
         unsigned long capabilities;     /* See asm-sh/rtc.h for cap bits */
@@ -578,7 +580,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
 
         /* get periodic/carry/alarm irqs */
         ret = platform_get_irq(pdev, 0);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for period\n");
                 goto err_badres;
@@ -586,7 +588,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
         rtc->periodic_irq = ret;
 
         ret = platform_get_irq(pdev, 1);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for carry\n");
                 goto err_badres;
@@ -594,7 +596,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
         rtc->carry_irq = ret;
 
         ret = platform_get_irq(pdev, 2);
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret <= 0)) {
                 ret = -ENOENT;
                 dev_err(&pdev->dev, "No IRQ for alarm\n");
                 goto err_badres;