diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 22:29:53 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 22:29:53 +0200 |
| commit | 4960ab7c8143e84e66b326804441f095d0db04d0 (patch) | |
| tree | 5924e3ff28da83d6d2714efb3b2e2e09d0c8350d /drivers/ide | |
| parent | sis5513: DMA setup fixes (diff) | |
| download | linux-dev-4960ab7c8143e84e66b326804441f095d0db04d0.tar.xz linux-dev-4960ab7c8143e84e66b326804441f095d0db04d0.zip | |
sis5513: always tune PIO
* Always set ->autotune in init_hwif_sis5513(), this means practically
no change in behavior since PIO was always tuned in ->ide_dma_check
and >autotune was always set for ->dma_base == 0 case.
* Bump driver version.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/sis5513.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index db8d96bd5a64..d33abb9f6476 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/pci/sis5513.c Version 0.28 Aug 1, 2007 + * linux/drivers/ide/pci/sis5513.c Version 0.29 Aug 1, 2007 * * Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org> * Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer @@ -603,11 +603,6 @@ static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed) static int sis5513_config_xfer_rate(ide_drive_t *drive) { - /* - * TODO: always set PIO mode and remove this - */ - ide_set_max_pio(drive); - drive->init_speed = 0; if (ide_tune_dma(drive)) @@ -841,11 +836,11 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) if (chipset_family >= ATA_133) hwif->udma_filter = sis5513_ata133_udma_filter; - if (!(hwif->dma_base)) { - hwif->drives[0].autotune = 1; - hwif->drives[1].autotune = 1; + hwif->drives[0].autotune = 1; + hwif->drives[1].autotune = 1; + + if (hwif->dma_base == 0) return; - } hwif->atapi_dma = 1; |