aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:53 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:53 -0400
commit4960ab7c8143e84e66b326804441f095d0db04d0 (patch)
tree5924e3ff28da83d6d2714efb3b2e2e09d0c8350d
parentc77a89cd98d99819f23a4a08e5e17ee1f13f6e4d (diff)
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>
-rw-r--r--drivers/ide/pci/sis5513.c15
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 @@
1/* 1/*
2 * linux/drivers/ide/pci/sis5513.c Version 0.28 Aug 1, 2007 2 * linux/drivers/ide/pci/sis5513.c Version 0.29 Aug 1, 2007
3 * 3 *
4 * Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org> 4 * Copyright (C) 1999-2000 Andre Hedrick <andre@linux-ide.org>
5 * Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer 5 * 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)
603 603
604static int sis5513_config_xfer_rate(ide_drive_t *drive) 604static int sis5513_config_xfer_rate(ide_drive_t *drive)
605{ 605{
606 /*
607 * TODO: always set PIO mode and remove this
608 */
609 ide_set_max_pio(drive);
610
611 drive->init_speed = 0; 606 drive->init_speed = 0;
612 607
613 if (ide_tune_dma(drive)) 608 if (ide_tune_dma(drive))
@@ -841,11 +836,11 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
841 if (chipset_family >= ATA_133) 836 if (chipset_family >= ATA_133)
842 hwif->udma_filter = sis5513_ata133_udma_filter; 837 hwif->udma_filter = sis5513_ata133_udma_filter;
843 838
844 if (!(hwif->dma_base)) { 839 hwif->drives[0].autotune = 1;
845 hwif->drives[0].autotune = 1; 840 hwif->drives[1].autotune = 1;
846 hwif->drives[1].autotune = 1; 841
842 if (hwif->dma_base == 0)
847 return; 843 return;
848 }
849 844
850 hwif->atapi_dma = 1; 845 hwif->atapi_dma = 1;
851 846