ide: skip probe if there are no devices on the port (v2)

In ide_probe_port() skip probe if ide_port_wait_ready() returns -ENODEV
and print error message instead of debug one if it returns -EBUSY.

v2:
Fix the default 'rc' value.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 28f95cb41c29..f9c2fb7d0005 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -702,8 +702,14 @@ static int ide_probe_port(ide_hwif_t *hwif)
         if (irqd)
                 disable_irq(hwif->irq);
 
-        if (ide_port_wait_ready(hwif) == -EBUSY)
-                printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
+        rc = ide_port_wait_ready(hwif);
+        if (rc == -ENODEV) {
+                printk(KERN_INFO "%s: no devices on the port\n", hwif->name);
+                goto out;
+        } else if (rc == -EBUSY)
+                printk(KERN_ERR "%s: not ready before the probe\n", hwif->name);
+        else
+                rc = -ENODEV;
 
         /*
          * Second drive should only exist if first drive was found,
@@ -714,7 +720,7 @@ static int ide_probe_port(ide_hwif_t *hwif)
                 if (drive->dev_flags & IDE_DFLAG_PRESENT)
                         rc = 0;
         }
-
+out:
         /*
          * Use cached IRQ number. It might be (and is...) changed by probe
          * code above