From dab4b5df9fea4e526e4d466d14fad516f486429d Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 25 Jan 2008 22:17:13 +0100
Subject: [PATCH] --- yaml --- r: 76245 b: refs/heads/master c:
 cd3dbc99da337f2130f3cb2691fbb65c8bf22337 h: refs/heads/master i:   76243:
 ae6c6b2ec442727123623fb8cd50e799334451da v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/ide-iops.c  | 6 ------
 trunk/drivers/ide/ide-probe.c | 5 ++++-
 trunk/include/linux/ide.h     | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f5a0c64d819c..917e5e9a5726 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fc573881957337c4ea1c84b92d2f27d076cad57
+refs/heads/master: cd3dbc99da337f2130f3cb2691fbb65c8bf22337
diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c
index 617888048eed..b6983b7b3b6c 100644
--- a/trunk/drivers/ide/ide-iops.c
+++ b/trunk/drivers/ide/ide-iops.c
@@ -189,12 +189,6 @@ void SELECT_MASK (ide_drive_t *drive, int mask)
 		HWIF(drive)->maskproc(drive, mask);
 }
 
-void QUIRK_LIST (ide_drive_t *drive)
-{
-	if (HWIF(drive)->quirkproc)
-		drive->quirk_list = HWIF(drive)->quirkproc(drive);
-}
-
 /*
  * Some localbus EIDE interfaces require a special access sequence
  * when using 32-bit I/O instructions to transfer data.  We call this
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 8e5d8dd315af..33e62d28465d 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -234,7 +234,10 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
 
 	drive->media = ide_disk;
 	printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" );
-	QUIRK_LIST(drive);
+
+	if (hwif->quirkproc)
+		drive->quirk_list = hwif->quirkproc(drive);
+
 	return;
 
 err_misc:
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 20969eb1789a..7a144c9ee098 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -964,7 +964,6 @@ extern u32 ide_read_24(ide_drive_t *);
 extern void SELECT_DRIVE(ide_drive_t *);
 extern void SELECT_INTERRUPT(ide_drive_t *);
 extern void SELECT_MASK(ide_drive_t *, int);
-extern void QUIRK_LIST(ide_drive_t *);
 
 extern int drive_is_ready(ide_drive_t *);