aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-iops.c6
-rw-r--r--drivers/ide/ide-probe.c5
-rw-r--r--include/linux/ide.h1
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 617888048eed..b6983b7b3b6c 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -189,12 +189,6 @@ void SELECT_MASK (ide_drive_t *drive, int mask)
189 HWIF(drive)->maskproc(drive, mask); 189 HWIF(drive)->maskproc(drive, mask);
190} 190}
191 191
192void QUIRK_LIST (ide_drive_t *drive)
193{
194 if (HWIF(drive)->quirkproc)
195 drive->quirk_list = HWIF(drive)->quirkproc(drive);
196}
197
198/* 192/*
199 * Some localbus EIDE interfaces require a special access sequence 193 * Some localbus EIDE interfaces require a special access sequence
200 * when using 32-bit I/O instructions to transfer data. We call this 194 * when using 32-bit I/O instructions to transfer data. We call this
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8e5d8dd315af..33e62d28465d 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -234,7 +234,10 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
234 234
235 drive->media = ide_disk; 235 drive->media = ide_disk;
236 printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" ); 236 printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" );
237 QUIRK_LIST(drive); 237
238 if (hwif->quirkproc)
239 drive->quirk_list = hwif->quirkproc(drive);
240
238 return; 241 return;
239 242
240err_misc: 243err_misc:
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 20969eb1789a..7a144c9ee098 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -964,7 +964,6 @@ extern u32 ide_read_24(ide_drive_t *);
964extern void SELECT_DRIVE(ide_drive_t *); 964extern void SELECT_DRIVE(ide_drive_t *);
965extern void SELECT_INTERRUPT(ide_drive_t *); 965extern void SELECT_INTERRUPT(ide_drive_t *);
966extern void SELECT_MASK(ide_drive_t *, int); 966extern void SELECT_MASK(ide_drive_t *, int);
967extern void QUIRK_LIST(ide_drive_t *);
968 967
969extern int drive_is_ready(ide_drive_t *); 968extern int drive_is_ready(ide_drive_t *);
970 969