Signed-off-by: Andrew Morton --- drivers/ide/ide-iops.c | 6 ------ drivers/ide/ide-probe.c | 5 ++++- include/linux/ide.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff -puN drivers/ide/ide-iops.c~ide-mm-ide-remove-quirk_list drivers/ide/ide-iops.c --- a/drivers/ide/ide-iops.c~ide-mm-ide-remove-quirk_list +++ a/drivers/ide/ide-iops.c @@ -189,12 +189,6 @@ void SELECT_MASK (ide_drive_t *drive, in 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 -puN drivers/ide/ide-probe.c~ide-mm-ide-remove-quirk_list drivers/ide/ide-probe.c --- a/drivers/ide/ide-probe.c~ide-mm-ide-remove-quirk_list +++ a/drivers/ide/ide-probe.c @@ -234,7 +234,10 @@ static inline void do_identify (ide_driv 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 -puN include/linux/ide.h~ide-mm-ide-remove-quirk_list include/linux/ide.h --- a/include/linux/ide.h~ide-mm-ide-remove-quirk_list +++ a/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 *); _