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, 9 insertions, 10 deletions

diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 25caada78398..23a07fe15a2c 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -326,9 +326,9 @@ ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
-        if (pdata->irq < 0) {
+        if (pdata->irq <= 0)
                 return -EINVAL;
-        }
+
         pdata->alrm_mday = alrm->time.tm_mday;
         pdata->alrm_hour = alrm->time.tm_hour;
         pdata->alrm_min = alrm->time.tm_min;
@@ -346,9 +346,9 @@ ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
-        if (pdata->irq < 0) {
+        if (pdata->irq <= 0)
                 return -EINVAL;
-        }
+
         alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday;
         alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour;
         alrm->time.tm_min = pdata->alrm_min < 0 ? 0 : pdata->alrm_min;
@@ -385,7 +385,7 @@ ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
         struct platform_device *pdev = to_platform_device(dev);
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
-        if (pdata->irq < 0) {
+        if (pdata->irq <= 0) {
                 return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */
         }
         switch (cmd) {
@@ -503,7 +503,6 @@ ds1511_rtc_probe(struct platform_device *pdev)
         if (!pdata) {
                 return -ENOMEM;
         }
-        pdata->irq = -1;
         pdata->size = res->end - res->start + 1;
         if (!request_mem_region(res->start, pdata->size, pdev->name)) {
                 ret = -EBUSY;
@@ -545,13 +544,13 @@ ds1511_rtc_probe(struct platform_device *pdev)
          * if the platform has an interrupt in mind for this device,
          * then by all means, set it
          */
-        if (pdata->irq >= 0) {
+        if (pdata->irq > 0) {
                 rtc_read(RTC_CMD1);
                 if (request_irq(pdata->irq, ds1511_interrupt,
                         IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) {
 
                         dev_warn(&pdev->dev, "interrupt not available.\n");
-                        pdata->irq = -1;
+                        pdata->irq = 0;
                 }
         }
 
@@ -572,7 +571,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
         if (pdata->rtc) {
                 rtc_device_unregister(pdata->rtc);
         }
-        if (pdata->irq >= 0) {
+        if (pdata->irq > 0) {
                 free_irq(pdata->irq, pdev);
         }
         if (ds1511_base) {
@@ -595,7 +594,7 @@ ds1511_rtc_remove(struct platform_device *pdev)
         sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
         rtc_device_unregister(pdata->rtc);
         pdata->rtc = NULL;
-        if (pdata->irq >= 0) {
+        if (pdata->irq > 0) {
                 /*
                  * disable the alarm interrupt
                  */