From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ravikiran G Thirumalai <kiran@scalex86.org>
Subject: [patch 1/4] ide: Break ide_lock -- Move hwif tuning code after hwif_init
Date: Tue, 6 Sep 2005 16:37:37 -0700
Message-ID: <20050906233737.GB3642@localhost.localdomain>
References: <20050906233322.GA3642@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-ide-owner@vger.kernel.org>
Received: from serv01.siteground.net ([70.85.91.68]:39110 "EHLO
	serv01.siteground.net") by vger.kernel.org with ESMTP
	id S1751059AbVIFXhh (ORCPT <rfc822;linux-ide@vger.kernel.org>);
	Tue, 6 Sep 2005 19:37:37 -0400
Content-Disposition: inline
In-Reply-To: <20050906233322.GA3642@localhost.localdomain>
Sender: linux-ide-owner@vger.kernel.org
List-Id: linux-ide@vger.kernel.org
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, "Shai Fultheim (Shai@scalex86.org)" <shai@scalex86.org>, Alok Kataria <alokk@calsoftinc.com>

Following patch moves the hwif tuning code from probe_hwif to ideprobe_init
after ideprobe_init calls hwif_init so that all hwif's have associated
hwgroups.  With this patch, we should always have hwgroups for hwifs during
calls the drive tune routines.


Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>

Index: linux-2.6.13/drivers/ide/ide-probe.c
===================================================================
--- linux-2.6.13.orig/drivers/ide/ide-probe.c	2005-09-06 11:22:29.000000000 -0700
+++ linux-2.6.13/drivers/ide/ide-probe.c	2005-09-06 15:12:58.000000000 -0700
@@ -852,8 +852,15 @@
 
 	if (!hwif->present) {
 		ide_hwif_release_regions(hwif);
-		return;
 	}
+}
+
+static void ide_tune_drives(ide_hwif_t * hwif)
+{
+	unsigned int unit;
+
+	if (!hwif->present)
+		return;
 
 	for (unit = 0; unit < MAX_DRIVES; ++unit) {
 		ide_drive_t *drive = &hwif->drives[unit];
@@ -1443,9 +1450,12 @@
 	for (index = 0; index < MAX_HWIFS; ++index)
 		if (probe[index])
 			probe_hwif(&ide_hwifs[index]);
-	for (index = 0; index < MAX_HWIFS; ++index)
-		if (probe[index])
+	for (index = 0; index < MAX_HWIFS; ++index) {
+		if (probe[index]) {
 			hwif_init(&ide_hwifs[index]);
+			ide_tune_drives(&ide_hwifs[index]);
+		}
+	}
 	for (index = 0; index < MAX_HWIFS; ++index) {
 		if (probe[index]) {
 			ide_hwif_t *hwif = &ide_hwifs[index];