aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_serverworks.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_serverworks.c')
-rw-r--r--drivers/ata/pata_serverworks.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 2f4f9b0f89de..ffd26d0dc50d 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -199,7 +199,7 @@ static unsigned long serverworks_osb4_filter(struct ata_device *adev, unsigned l
199{ 199{
200 if (adev->class == ATA_DEV_ATA) 200 if (adev->class == ATA_DEV_ATA)
201 mask &= ~ATA_MASK_UDMA; 201 mask &= ~ATA_MASK_UDMA;
202 return ata_pci_default_filter(adev, mask); 202 return ata_bmdma_mode_filter(adev, mask);
203} 203}
204 204
205 205
@@ -219,7 +219,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
219 219
220 /* Disk, UDMA */ 220 /* Disk, UDMA */
221 if (adev->class != ATA_DEV_ATA) 221 if (adev->class != ATA_DEV_ATA)
222 return ata_pci_default_filter(adev, mask); 222 return ata_bmdma_mode_filter(adev, mask);
223 223
224 /* Actually do need to check */ 224 /* Actually do need to check */
225 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num)); 225 ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
@@ -228,7 +228,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
228 if (!strcmp(p, model_num)) 228 if (!strcmp(p, model_num))
229 mask &= ~(0xE0 << ATA_SHIFT_UDMA); 229 mask &= ~(0xE0 << ATA_SHIFT_UDMA);
230 } 230 }
231 return ata_pci_default_filter(adev, mask); 231 return ata_bmdma_mode_filter(adev, mask);
232} 232}
233 233
234/** 234/**
@@ -459,9 +459,9 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
459 serverworks_fixup_ht1000(pdev); 459 serverworks_fixup_ht1000(pdev);
460 460
461 if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE) 461 if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
462 ata_pci_clear_simplex(pdev); 462 ata_pci_bmdma_clear_simplex(pdev);
463 463
464 return ata_pci_init_one(pdev, ppi, &serverworks_sht, NULL); 464 return ata_pci_sff_init_one(pdev, ppi, &serverworks_sht, NULL);
465} 465}
466 466
467#ifdef CONFIG_PM 467#ifdef CONFIG_PM
@@ -482,7 +482,7 @@ static int serverworks_reinit_one(struct pci_dev *pdev)
482 serverworks_fixup_osb4(pdev); 482 serverworks_fixup_osb4(pdev);
483 break; 483 break;
484 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE: 484 case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
485 ata_pci_clear_simplex(pdev); 485 ata_pci_bmdma_clear_simplex(pdev);
486 /* fall through */ 486 /* fall through */
487 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE: 487 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
488 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: 488 case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: