diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
commit | 26bcb879c03254545a19c6700fe5bcef6f21e7b1 (patch) | |
tree | dc35f1a7d7860fe0de268ff92189ff0884b689d3 /drivers/ide/pci/cs5520.c | |
parent | 842c19ad6fc0dbd9ac9d2f8527466201802934cf (diff) |
ide: add ide_set{_max}_pio() (take 4)
* Add IDE_HFLAG_ABUSE_{PREFETCH,FAST_DEVSEL,DMA_MODES} flags
and set them in ht6560, cmd640, cmd64x and sc1200 host drivers.
* Add set_pio_mode_abuse() for checking if host driver has a non-standard
->tuneproc() implementation and use it in do_special().
* Add ide_set_pio() for setting PIO mode (it uses hwif->pio_mask to find
the maximum PIO mode supported by the host), also add ide_set_max_pio()
wrapper for ide_set_pio() to use for auto-tuning. Convert users of
->tuneproc to use ide_set{_max}_pio() where possible. This leaves only
do_special(), set_using_pio(), ide_hwif_restore() and ide_set_pio() as
a direct users of ->tuneproc.
* Remove no longer needed ide_get_best_pio_mode() calls and printk-s
reporting PIO mode selected from ->tuneproc implementations.
* Rename ->tuneproc hook to ->set_pio_mode and make 'pio' argument const.
* Remove stale comment from ide_config_drive_speed().
v2:
* Fix "ata_" prefix (Noticed by Jeff).
v3:
* Minor cleanups/fixups per Sergei's suggestions.
v4:
* Fix compile problem in drivers/ide/pci/cmd640.c
(Noticed by Andrew Morton).
* Improve some ->set_pio_mode comments.
Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cs5520.c')
-rw-r--r-- | drivers/ide/pci/cs5520.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index af67438328a8..a73c318ff086 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
@@ -122,17 +122,16 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed) | |||
122 | 122 | ||
123 | return error; | 123 | return error; |
124 | } | 124 | } |
125 | 125 | ||
126 | static void cs5520_tune_drive(ide_drive_t *drive, u8 pio) | 126 | static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio) |
127 | { | 127 | { |
128 | pio = ide_get_best_pio_mode(drive, pio, 4); | 128 | cs5520_tune_chipset(drive, XFER_PIO_0 + pio); |
129 | cs5520_tune_chipset(drive, (XFER_PIO_0 + pio)); | ||
130 | } | 129 | } |
131 | 130 | ||
132 | static int cs5520_config_drive_xfer_rate(ide_drive_t *drive) | 131 | static int cs5520_config_drive_xfer_rate(ide_drive_t *drive) |
133 | { | 132 | { |
134 | /* Tune the drive for PIO modes up to PIO 4 */ | 133 | /* Tune the drive for PIO modes up to PIO 4 */ |
135 | cs5520_tune_drive(drive, 255); | 134 | ide_set_max_pio(drive); |
136 | 135 | ||
137 | /* Then tell the core to use DMA operations */ | 136 | /* Then tell the core to use DMA operations */ |
138 | return 0; | 137 | return 0; |
@@ -164,7 +163,7 @@ static int cs5520_dma_on(ide_drive_t *drive) | |||
164 | 163 | ||
165 | static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) | 164 | static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) |
166 | { | 165 | { |
167 | hwif->tuneproc = &cs5520_tune_drive; | 166 | hwif->set_pio_mode = &cs5520_set_pio_mode; |
168 | hwif->speedproc = &cs5520_tune_chipset; | 167 | hwif->speedproc = &cs5520_tune_chipset; |
169 | hwif->ide_dma_check = &cs5520_config_drive_xfer_rate; | 168 | hwif->ide_dma_check = &cs5520_config_drive_xfer_rate; |
170 | hwif->ide_dma_on = &cs5520_dma_on; | 169 | hwif->ide_dma_on = &cs5520_dma_on; |