ide: remove drive->init_speed zeroing

Several host drivers used to reset drive->init_speed in their ->ide_dma_check
implementations which resulted in incorrect init speed being reported to the
user, fix it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 0b83443bf250f3111af476d732f0a938c9c7135a..9582794eb65a4478abd2dd2e9f7ec8eae6d6b7c9 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -446,8 +446,6 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 14a61b1c80acd2047c4b2d147cff6e6cefb68e19..644f4aea795a42fd69d44875d85a3975d0fb3712 100644 (file)
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -168,8 +168,6 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static int atiixp_dma_check(ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 257865778f923ce628b673bf52f9eb4e292bd10e..896cc9211bd3efc21db67c0c2472771fe63cccd0 100644 (file)
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -159,8 +159,6 @@ static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int cs5535_dma_check(ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 218852aaf22aa11329dae8d320f3b6be1ba091c2..bccf0667a732a5944ab83613f3c1392d9028c7d3 100644 (file)
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -82,8 +82,6 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return -1;
 

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 1433fc6954a312ba3dfa72872ca0a16502223b89..a8097b5476a26d40278053a04446866bdb70111b 100644 (file)
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -715,8 +715,6 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
 
 static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index ad0bdcb0c02b97371ee1f8ccb9419c5775976d02..c3a751207e649314b0812e6d4b902cddbc9dc5e2 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -225,8 +225,6 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
 
 static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 8c3e8cf36ec9da78e5dcbe7ba210ad9eb6a3fd37..9847a4ff7d40d4a439ed18b960c9eadf428020f0 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -181,8 +181,6 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif)
 
 static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 4b397d6418489497133dbcb5aaf3afc4ba20596a..4dd1b6d0acb5414c347ae1e5f4a7257da3212c95 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -264,8 +264,6 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
  
 static int piix_config_drive_xfer_rate (ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 40b03836755c23decb6c1edc7e22a60b7f089c0c..b7076f4569a4233e5bd45fabd2f831f186ba4045 100644 (file)
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -198,8 +198,6 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index d33abb9f6476b041f2ca8829362ba3c16d62278f..99fe0b6827245436eca37d92fcc90c37edd0bcb2 100644 (file)
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -603,8 +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)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;
 

diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 772b58671bb2ac0407904dedff1d81114a8cea28..38da0659ec07c0f970cbfd6c561fc280b447ae62 100644 (file)
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -132,8 +132,6 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
 {
-       drive->init_speed = 0;
-
        if (ide_tune_dma(drive))
                return 0;