diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/ata_piix.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 13b6b1df2ac4..0458811010fd 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -155,7 +155,6 @@ struct piix_host_priv { | |||
155 | static int piix_init_one (struct pci_dev *pdev, | 155 | static int piix_init_one (struct pci_dev *pdev, |
156 | const struct pci_device_id *ent); | 156 | const struct pci_device_id *ent); |
157 | static void piix_pata_error_handler(struct ata_port *ap); | 157 | static void piix_pata_error_handler(struct ata_port *ap); |
158 | static void piix_sata_error_handler(struct ata_port *ap); | ||
159 | static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev); | 158 | static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev); |
160 | static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev); | 159 | static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev); |
161 | static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); | 160 | static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); |
@@ -364,7 +363,7 @@ static const struct ata_port_operations piix_sata_ops = { | |||
364 | 363 | ||
365 | .freeze = ata_bmdma_freeze, | 364 | .freeze = ata_bmdma_freeze, |
366 | .thaw = ata_bmdma_thaw, | 365 | .thaw = ata_bmdma_thaw, |
367 | .error_handler = piix_sata_error_handler, | 366 | .error_handler = ata_bmdma_error_handler, |
368 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | 367 | .post_internal_cmd = ata_bmdma_post_internal_cmd, |
369 | 368 | ||
370 | .irq_handler = ata_interrupt, | 369 | .irq_handler = ata_interrupt, |
@@ -641,12 +640,6 @@ static void piix_pata_error_handler(struct ata_port *ap) | |||
641 | ata_std_postreset); | 640 | ata_std_postreset); |
642 | } | 641 | } |
643 | 642 | ||
644 | static void piix_sata_error_handler(struct ata_port *ap) | ||
645 | { | ||
646 | ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL, | ||
647 | ata_std_postreset); | ||
648 | } | ||
649 | |||
650 | /** | 643 | /** |
651 | * piix_set_piomode - Initialize host controller PATA PIO timings | 644 | * piix_set_piomode - Initialize host controller PATA PIO timings |
652 | * @ap: Port whose timings we are configuring | 645 | * @ap: Port whose timings we are configuring |