diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:54 -0400 |
commit | d3b90baf0924c13045c56c3d0a766f9374fe7a9e (patch) | |
tree | f0cc28da2304ea9912f882e99cb6c2723d1a9b43 /drivers/ide | |
parent | 8446f65988b48d19cf419aa4def9a9ccfed17b76 (diff) |
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/atiixp.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/cs5535.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/hpt366.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/piix.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/serverworks.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/sis5513.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/slc90e66.c | 2 |
11 files changed, 0 insertions, 22 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 0b83443bf250..9582794eb65a 100644 --- 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) | |||
446 | 446 | ||
447 | static int ali15x3_config_drive_for_dma(ide_drive_t *drive) | 447 | static int ali15x3_config_drive_for_dma(ide_drive_t *drive) |
448 | { | 448 | { |
449 | drive->init_speed = 0; | ||
450 | |||
451 | if (ide_tune_dma(drive)) | 449 | if (ide_tune_dma(drive)) |
452 | return 0; | 450 | return 0; |
453 | 451 | ||
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c index 14a61b1c80ac..644f4aea795a 100644 --- 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) | |||
168 | 168 | ||
169 | static int atiixp_dma_check(ide_drive_t *drive) | 169 | static int atiixp_dma_check(ide_drive_t *drive) |
170 | { | 170 | { |
171 | drive->init_speed = 0; | ||
172 | |||
173 | if (ide_tune_dma(drive)) | 171 | if (ide_tune_dma(drive)) |
174 | return 0; | 172 | return 0; |
175 | 173 | ||
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index 257865778f92..896cc9211bd3 100644 --- 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) | |||
159 | 159 | ||
160 | static int cs5535_dma_check(ide_drive_t *drive) | 160 | static int cs5535_dma_check(ide_drive_t *drive) |
161 | { | 161 | { |
162 | drive->init_speed = 0; | ||
163 | |||
164 | if (ide_tune_dma(drive)) | 162 | if (ide_tune_dma(drive)) |
165 | return 0; | 163 | return 0; |
166 | 164 | ||
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 218852aaf22a..bccf0667a732 100644 --- 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) | |||
82 | 82 | ||
83 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) | 83 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) |
84 | { | 84 | { |
85 | drive->init_speed = 0; | ||
86 | |||
87 | if (ide_tune_dma(drive)) | 85 | if (ide_tune_dma(drive)) |
88 | return -1; | 86 | return -1; |
89 | 87 | ||
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 1433fc6954a3..a8097b5476a2 100644 --- 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) | |||
715 | 715 | ||
716 | static int hpt366_config_drive_xfer_rate(ide_drive_t *drive) | 716 | static int hpt366_config_drive_xfer_rate(ide_drive_t *drive) |
717 | { | 717 | { |
718 | drive->init_speed = 0; | ||
719 | |||
720 | if (ide_tune_dma(drive)) | 718 | if (ide_tune_dma(drive)) |
721 | return 0; | 719 | return 0; |
722 | 720 | ||
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index ad0bdcb0c02b..c3a751207e64 100644 --- 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) | |||
225 | 225 | ||
226 | static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive) | 226 | static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive) |
227 | { | 227 | { |
228 | drive->init_speed = 0; | ||
229 | |||
230 | if (ide_tune_dma(drive)) | 228 | if (ide_tune_dma(drive)) |
231 | return 0; | 229 | return 0; |
232 | 230 | ||
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 8c3e8cf36ec9..9847a4ff7d40 100644 --- 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) | |||
181 | 181 | ||
182 | static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive) | 182 | static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive) |
183 | { | 183 | { |
184 | drive->init_speed = 0; | ||
185 | |||
186 | if (ide_tune_dma(drive)) | 184 | if (ide_tune_dma(drive)) |
187 | return 0; | 185 | return 0; |
188 | 186 | ||
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 4b397d641848..4dd1b6d0acb5 100644 --- 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) | |||
264 | 264 | ||
265 | static int piix_config_drive_xfer_rate (ide_drive_t *drive) | 265 | static int piix_config_drive_xfer_rate (ide_drive_t *drive) |
266 | { | 266 | { |
267 | drive->init_speed = 0; | ||
268 | |||
269 | if (ide_tune_dma(drive)) | 267 | if (ide_tune_dma(drive)) |
270 | return 0; | 268 | return 0; |
271 | 269 | ||
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index 40b03836755c..b7076f4569a4 100644 --- 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) | |||
198 | 198 | ||
199 | static int svwks_config_drive_xfer_rate (ide_drive_t *drive) | 199 | static int svwks_config_drive_xfer_rate (ide_drive_t *drive) |
200 | { | 200 | { |
201 | drive->init_speed = 0; | ||
202 | |||
203 | if (ide_tune_dma(drive)) | 201 | if (ide_tune_dma(drive)) |
204 | return 0; | 202 | return 0; |
205 | 203 | ||
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index d33abb9f6476..99fe0b682724 100644 --- 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) | |||
603 | 603 | ||
604 | static int sis5513_config_xfer_rate(ide_drive_t *drive) | 604 | static int sis5513_config_xfer_rate(ide_drive_t *drive) |
605 | { | 605 | { |
606 | drive->init_speed = 0; | ||
607 | |||
608 | if (ide_tune_dma(drive)) | 606 | if (ide_tune_dma(drive)) |
609 | return 0; | 607 | return 0; |
610 | 608 | ||
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 772b58671bb2..38da0659ec07 100644 --- 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) | |||
132 | 132 | ||
133 | static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive) | 133 | static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive) |
134 | { | 134 | { |
135 | drive->init_speed = 0; | ||
136 | |||
137 | if (ide_tune_dma(drive)) | 135 | if (ide_tune_dma(drive)) |
138 | return 0; | 136 | return 0; |
139 | 137 | ||