diff options
Diffstat (limited to 'drivers/ata/pata_ns87410.c')
-rw-r--r-- | drivers/ata/pata_ns87410.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 5a043e426480..4d2eefee7387 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -54,20 +54,6 @@ static int ns87410_pre_reset(struct ata_link *link, unsigned long deadline) | |||
54 | } | 54 | } |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * ns87410_error_handler - probe reset | ||
58 | * @ap: ATA port | ||
59 | * | ||
60 | * Perform the ATA probe and bus reset sequence plus specific handling | ||
61 | * for this hardware. The MPIIX has the enable bits in a different place | ||
62 | * to PIIX4 and friends. As a pure PIO device it has no cable detect | ||
63 | */ | ||
64 | |||
65 | static void ns87410_error_handler(struct ata_port *ap) | ||
66 | { | ||
67 | ata_bmdma_drive_eh(ap, ns87410_pre_reset, ata_std_softreset, NULL, ata_std_postreset); | ||
68 | } | ||
69 | |||
70 | /** | ||
71 | * ns87410_set_piomode - set initial PIO mode data | 57 | * ns87410_set_piomode - set initial PIO mode data |
72 | * @ap: ATA interface | 58 | * @ap: ATA interface |
73 | * @adev: ATA device | 59 | * @adev: ATA device |
@@ -152,7 +138,7 @@ static struct ata_port_operations ns87410_port_ops = { | |||
152 | .qc_issue = ns87410_qc_issue_prot, | 138 | .qc_issue = ns87410_qc_issue_prot, |
153 | .cable_detect = ata_cable_40wire, | 139 | .cable_detect = ata_cable_40wire, |
154 | .set_piomode = ns87410_set_piomode, | 140 | .set_piomode = ns87410_set_piomode, |
155 | .error_handler = ns87410_error_handler, | 141 | .prereset = ns87410_pre_reset, |
156 | }; | 142 | }; |
157 | 143 | ||
158 | static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 144 | static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) |