diff options
Diffstat (limited to 'drivers/ata/pata_opti.c')
-rw-r--r-- | drivers/ata/pata_opti.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c index 5a5f20e03fc0..4ddd03a67775 100644 --- a/drivers/ata/pata_opti.c +++ b/drivers/ata/pata_opti.c | |||
@@ -68,21 +68,6 @@ static int opti_pre_reset(struct ata_link *link, unsigned long deadline) | |||
68 | } | 68 | } |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * opti_probe_reset - probe reset | ||
72 | * @ap: ATA port | ||
73 | * | ||
74 | * Perform the ATA probe and bus reset sequence plus specific handling | ||
75 | * for this hardware. The Opti needs little handling - we have no UDMA66 | ||
76 | * capability that needs cable detection. All we must do is check the port | ||
77 | * is enabled. | ||
78 | */ | ||
79 | |||
80 | static void opti_error_handler(struct ata_port *ap) | ||
81 | { | ||
82 | ata_bmdma_drive_eh(ap, opti_pre_reset, ata_std_softreset, NULL, ata_std_postreset); | ||
83 | } | ||
84 | |||
85 | /** | ||
86 | * opti_write_reg - control register setup | 71 | * opti_write_reg - control register setup |
87 | * @ap: ATA port | 72 | * @ap: ATA port |
88 | * @value: value | 73 | * @value: value |
@@ -172,7 +157,7 @@ static struct ata_port_operations opti_port_ops = { | |||
172 | .inherits = &ata_sff_port_ops, | 157 | .inherits = &ata_sff_port_ops, |
173 | .cable_detect = ata_cable_40wire, | 158 | .cable_detect = ata_cable_40wire, |
174 | .set_piomode = opti_set_piomode, | 159 | .set_piomode = opti_set_piomode, |
175 | .error_handler = opti_error_handler, | 160 | .prereset = opti_pre_reset, |
176 | }; | 161 | }; |
177 | 162 | ||
178 | static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 163 | static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id) |