From 4fb4b9633ff7129d1aab49b3d8da897ac9fca45a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 10 Oct 2008 22:39:29 +0200 Subject: [PATCH] --- yaml --- r: 112890 b: refs/heads/master c: 5d5870f0a26e2304c4a82592870c5bc88017f7c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/sl82c105.c | 2 +- trunk/include/linux/ide.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ba573ea4c8f4..7edb571d2a1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fa295e12d490fd571c614b221defaa9212c20dc +refs/heads/master: 5d5870f0a26e2304c4a82592870c5bc88017f7c9 diff --git a/trunk/drivers/ide/pci/sl82c105.c b/trunk/drivers/ide/pci/sl82c105.c index 61a006cb4746..8cc4e137c608 100644 --- a/trunk/drivers/ide/pci/sl82c105.c +++ b/trunk/drivers/ide/pci/sl82c105.c @@ -61,7 +61,7 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) if (cmd_off == 0) cmd_off = 1; - if (pio > 2 || ide_dev_has_iordy(drive->id)) + if (pio > 2 || ata_id_has_iordy(drive->id)) iordy = 0x40; return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy; diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index e5622bb5a4a1..27829c13bef7 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -1382,11 +1382,6 @@ const char *ide_xfer_verbose(u8 mode); extern void ide_toggle_bounce(ide_drive_t *drive, int on); extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate); -static inline int ide_dev_has_iordy(u16 *id) -{ - return ((id[ATA_ID_FIELD_VALID] & 2) && ata_id_has_iordy(id)) ? 1 : 0; -} - static inline int ide_dev_is_sata(u16 *id) { /*