From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 2 Feb 2008 18:56:38 +0000 (+0100)
Subject: ide: remove redundant hwif->present check from ide_register_hw()
X-Git-Tag: v2.6.25-rc1~1068^2~60
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2244e850632f82466d7c041546326c7055fc7159;p=linux-2.6-omap-h63xx.git

ide: remove redundant hwif->present check from ide_register_hw()

We check earlier for hwif->present and call ide_unregister() if necessary
(after ide_unregister() hwif->present will be always cleared).

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

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index eeb0e6a77f5..a71591ab0c5 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -720,8 +720,6 @@ found:
 		ide_init_port_data(hwif, index);
 		init_hwif_default(hwif, index);
 	}
-	if (hwif->present)
-		return -1;
 
 	ide_init_port_hw(hwif, hw);
 	hwif->quirkproc = quirkproc;