diff options
Diffstat (limited to 'drivers/ide/pci/pdc202xx_new.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index a23853445af9..772ca4007de4 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -82,16 +82,6 @@ static u8 max_dma_rate(struct pci_dev *pdev) | |||
82 | return mode; | 82 | return mode; |
83 | } | 83 | } |
84 | 84 | ||
85 | static u8 pdcnew_ratemask(ide_drive_t *drive) | ||
86 | { | ||
87 | u8 mode = max_dma_rate(HWIF(drive)->pci_dev); | ||
88 | |||
89 | if (!eighty_ninty_three(drive)) | ||
90 | mode = min_t(u8, mode, 1); | ||
91 | |||
92 | return mode; | ||
93 | } | ||
94 | |||
95 | /** | 85 | /** |
96 | * get_indexed_reg - Get indexed register | 86 | * get_indexed_reg - Get indexed register |
97 | * @hwif: for the port address | 87 | * @hwif: for the port address |
@@ -164,7 +154,7 @@ static int pdcnew_tune_chipset(ide_drive_t *drive, u8 speed) | |||
164 | u8 adj = (drive->dn & 1) ? 0x08 : 0x00; | 154 | u8 adj = (drive->dn & 1) ? 0x08 : 0x00; |
165 | int err; | 155 | int err; |
166 | 156 | ||
167 | speed = ide_rate_filter(pdcnew_ratemask(drive), speed); | 157 | speed = ide_rate_filter(drive, speed); |
168 | 158 | ||
169 | /* | 159 | /* |
170 | * Issue SETFEATURES_XFER to the drive first. PDC202xx hardware will | 160 | * Issue SETFEATURES_XFER to the drive first. PDC202xx hardware will |
@@ -267,7 +257,7 @@ static int config_chipset_for_dma(ide_drive_t *drive) | |||
267 | set_indexed_reg(hwif, 0x13 + adj, tmp | 0x03); | 257 | set_indexed_reg(hwif, 0x13 + adj, tmp | 0x03); |
268 | } | 258 | } |
269 | 259 | ||
270 | speed = ide_dma_speed(drive, pdcnew_ratemask(drive)); | 260 | speed = ide_max_dma_mode(drive); |
271 | 261 | ||
272 | if (!speed) | 262 | if (!speed) |
273 | return 0; | 263 | return 0; |