Skip to contentSkip to conversation

: Suppress output of error messages for non-existant interfaces

PATCH Applied Prarit Bhargava 2 participants 2 messages Jan 12, 2005 – Jan 15, 2005 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Suppress output of error messages for non-existant interfaces

Suppress output of "Wait for ready failed before probe !" messages for non-existant interfaces.

Please see http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for further context on this patch.

drivers/ide/ide-probe.c +1 -1
@@ -742,21 +742,21 @@
 	 *    their reset sequence even when they are non-selected slave
 	 *    devices, thus preventing discovery of the main HD
 	 *    
 	 *  Doing this wait-for-busy should not harm any existing configuration
 	 *  (at least things won't be worse than what current code does, that
 	 *  is blindly go & talk to the drive) and fix some issues like the
 	 *  above.
 	 *  
 	 *  BenH.
 	 */
-	if (wait_hwif_ready(hwif))
+	if (wait_hwif_ready(hwif) == -EBUSY)
 		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
 	/*
 	 * Second drive should only exist if first drive was found,
 	 * but a lot of cdrom drives are configured as single slaves.
 	 */
 	for (unit = 0; unit < MAX_DRIVES; ++unit) {
 		ide_drive_t *drive = &hwif->drives[unit];
 		drive->dn = (hwif->channel ? 2 : 0) + unit;
 		(void) probe_for_drive(drive);
#1 lore raw
Quoted 6 lines · Prarit Bhargava

Suppress output of "Wait for ready failed before probe !" messages for non-existant interfaces.

Please see
http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for further context on this patch.

applied, thanks

Quoted 26 lines
drivers/ide/ide-probe.c 2005-01-12 09:01:25.000000000 -0500 renamed from drivers/ide/ide-probe.c 2005-01-12 09:00:49.000000000 -0500 +1 -1
@@ -742,21 +742,21 @@
         *    their reset sequence even when they are non-selected slave
         *    devices, thus preventing discovery of the main HD
         *
         *  Doing this wait-for-busy should not harm any existing configuration
         *  (at least things won't be worse than what current code does, that
         *  is blindly go & talk to the drive) and fix some issues like the
         *  above.
         *
         *  BenH.
         */
-       if (wait_hwif_ready(hwif))
+       if (wait_hwif_ready(hwif) == -EBUSY)
                printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
        /*
         * Second drive should only exist if first drive was found,
         * but a lot of cdrom drives are configured as single slaves.
         */
        for (unit = 0; unit < MAX_DRIVES; ++unit) {
                ide_drive_t *drive = &hwif->drives[unit];
                drive->dn = (hwif->channel ? 2 : 0) + unit;
                (void) probe_for_drive(drive);