Skip to content

L
linux-davinci
Commit 65c9cd23 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files
Options

ide: remove ide_use_fast_pio() 

Remove ide_use_fast_pio() and just re-tune PIO unconditionally if DMA tuning
has failed in ->ide_dma_check.  All host drivers using ide_use_fast_pio() set
drive->autotune so PIO is always tuned anyway and in some cases we _really_
need to re-tune PIO because PIO and DMA timings are shared.
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d3b90baf
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 46 deletions
drivers/ide/ide-lib.c
View file @ 65c9cd23
......@@ -96,21 +96,6 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed)
return min(speed, mode);
}
int ide_use_fast_pio(ide_drive_t *drive)
{
struct hd_driveid *id = drive->id;
if ((id->capability & 1) && drive->autodma)
return 1;
if ((id->capability & 8) || (id->field_valid & 2))
return 1;
return 0;
}
EXPORT_SYMBOL_GPL(ide_use_fast_pio);
/*
* Standard (generic) timings for PIO modes, from ATA2 specification.
* These timings are for access to the IDE data port register *only*.
......
drivers/ide/pci/aec62xx.c
View file @ 65c9cd23
......@@ -146,8 +146,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/atiixp.c
View file @ 65c9cd23
......@@ -171,8 +171,7 @@ static int atiixp_dma_check(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/cmd64x.c
View file @ 65c9cd23
......@@ -335,8 +335,7 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/cs5535.c
View file @ 65c9cd23
......@@ -162,8 +162,7 @@ static int cs5535_dma_check(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/hpt34x.c
View file @ 65c9cd23
......@@ -85,8 +85,7 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return -1;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/hpt366.c
View file @ 65c9cd23
......@@ -718,8 +718,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/pdc202xx_new.c
View file @ 65c9cd23
......@@ -228,8 +228,7 @@ static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/pdc202xx_old.c
View file @ 65c9cd23
......@@ -184,8 +184,7 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/piix.c
View file @ 65c9cd23
......@@ -267,8 +267,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/scc_pata.c
View file @ 65c9cd23
......@@ -299,8 +299,7 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/serverworks.c
View file @ 65c9cd23
......@@ -201,8 +201,7 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/siimage.c
View file @ 65c9cd23
......@@ -326,8 +326,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/sis5513.c
View file @ 65c9cd23
......@@ -606,8 +606,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/slc90e66.c
View file @ 65c9cd23
......@@ -135,8 +135,7 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
drivers/ide/pci/tc86c001.c
View file @ 65c9cd23
......@@ -167,8 +167,7 @@ static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_tune_dma(drive))
return 0;
if (ide_use_fast_pio(drive))
ide_set_max_pio(drive);
ide_set_max_pio(drive);
return -1;
}
......
include/linux/ide.h
View file @ 65c9cd23
......@@ -1380,7 +1380,6 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
extern char *ide_xfer_verbose(u8 xfer_rate);
extern void ide_toggle_bounce(ide_drive_t *drive, int on);
extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
int ide_use_fast_pio(ide_drive_t *);
static inline int ide_dev_has_iordy(struct hd_driveid *id)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment