diff options
Diffstat (limited to 'drivers/ata/pata_mpiix.c')
-rw-r--r-- | drivers/ata/pata_mpiix.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index dab54f8a272d..1b9d0d412ebf 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
@@ -59,20 +59,6 @@ static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline) | |||
59 | } | 59 | } |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * mpiix_error_handler - probe reset | ||
63 | * @ap: ATA port | ||
64 | * | ||
65 | * Perform the ATA probe and bus reset sequence plus specific handling | ||
66 | * for this hardware. The MPIIX has the enable bits in a different place | ||
67 | * to PIIX4 and friends. As a pure PIO device it has no cable detect | ||
68 | */ | ||
69 | |||
70 | static void mpiix_error_handler(struct ata_port *ap) | ||
71 | { | ||
72 | ata_bmdma_drive_eh(ap, mpiix_pre_reset, ata_std_softreset, NULL, ata_std_postreset); | ||
73 | } | ||
74 | |||
75 | /** | ||
76 | * mpiix_set_piomode - set initial PIO mode data | 62 | * mpiix_set_piomode - set initial PIO mode data |
77 | * @ap: ATA interface | 63 | * @ap: ATA interface |
78 | * @adev: ATA device | 64 | * @adev: ATA device |
@@ -159,7 +145,7 @@ static struct ata_port_operations mpiix_port_ops = { | |||
159 | .qc_issue = mpiix_qc_issue_prot, | 145 | .qc_issue = mpiix_qc_issue_prot, |
160 | .cable_detect = ata_cable_40wire, | 146 | .cable_detect = ata_cable_40wire, |
161 | .set_piomode = mpiix_set_piomode, | 147 | .set_piomode = mpiix_set_piomode, |
162 | .error_handler = mpiix_error_handler, | 148 | .prereset = mpiix_pre_reset, |
163 | }; | 149 | }; |
164 | 150 | ||
165 | static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 151 | static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) |