|
@@ -693,35 +693,16 @@ static u8 ide_auto_reduce_xfer (ide_drive_t *drive)
|
|
|
}
|
|
|
#endif /* CONFIG_BLK_DEV_IDEDMA */
|
|
|
|
|
|
-/*
|
|
|
- * Update the
|
|
|
- */
|
|
|
-int ide_driveid_update (ide_drive_t *drive)
|
|
|
+int ide_driveid_update(ide_drive_t *drive)
|
|
|
{
|
|
|
- ide_hwif_t *hwif = HWIF(drive);
|
|
|
+ ide_hwif_t *hwif = drive->hwif;
|
|
|
struct hd_driveid *id;
|
|
|
-#if 0
|
|
|
- id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
|
|
|
- if (!id)
|
|
|
- return 0;
|
|
|
-
|
|
|
- taskfile_lib_get_identify(drive, (char *)&id);
|
|
|
+ unsigned long timeout, flags;
|
|
|
|
|
|
- ide_fix_driveid(id);
|
|
|
- if (id) {
|
|
|
- drive->id->dma_ultra = id->dma_ultra;
|
|
|
- drive->id->dma_mword = id->dma_mword;
|
|
|
- drive->id->dma_1word = id->dma_1word;
|
|
|
- /* anything more ? */
|
|
|
- kfree(id);
|
|
|
- }
|
|
|
- return 1;
|
|
|
-#else
|
|
|
/*
|
|
|
* Re-read drive->id for possible DMA mode
|
|
|
* change (copied from ide-probe.c)
|
|
|
*/
|
|
|
- unsigned long timeout, flags;
|
|
|
|
|
|
SELECT_MASK(drive, 1);
|
|
|
if (IDE_CONTROL_REG)
|
|
@@ -763,7 +744,6 @@ int ide_driveid_update (ide_drive_t *drive)
|
|
|
}
|
|
|
|
|
|
return 1;
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
|