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

ide: remove redundant init_hwif_default() call from ide_register_hw()

ide_init_port_hw() call overrides setup done by init_hwif_default().

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

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a71591ab0c5..4b130e7102e 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -716,10 +716,8 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
 found:
 	if (hwif->present)
 		ide_unregister(index);
-	else if (!hwif->hold) {
+	else if (!hwif->hold)
 		ide_init_port_data(hwif, index);
-		init_hwif_default(hwif, index);
-	}
 
 	ide_init_port_hw(hwif, hw);
 	hwif->quirkproc = quirkproc;