ide: ide_dev_has_iordy() -> ata_id_has_iordy()

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jul 28, 2008 libata

Share & tools

Bartlomiej Zolnierkiewicz

author

2008-07-28 21:03 UTC #0 lore raw

PATCH 1/3 ide: ide_dev_has_iordy() -> ata_id_has_iordy()

* Remove (id[ATA_ID_FIELD_VALID] & 2) check from ide_dev_has_iordy() (it is for validity of words 64-70, IORDY is in word 49).

* ide_dev_has_iordy() -> ata_id_has_iordy()

Cc Sergei Shtylyov <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/pci/sl82c105.c |    2 +-
 include/linux/ide.h        |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

drivers/ide/pci/sl82c105.c +1 -1

Index: b/drivers/ide/pci/sl82c105.c
===================================================================
@@ -61,7 +61,7 @@ static unsigned int get_pio_timings(ide_
 	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;

include/linux/ide.h +0 -5

Index: b/include/linux/ide.h
===================================================================
@@ -1391,11 +1391,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)
 {
 	/*