|
@@ -155,7 +155,6 @@ struct piix_host_priv {
|
|
|
static int piix_init_one (struct pci_dev *pdev,
|
|
|
const struct pci_device_id *ent);
|
|
|
static void piix_pata_error_handler(struct ata_port *ap);
|
|
|
-static void piix_sata_error_handler(struct ata_port *ap);
|
|
|
static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
|
|
|
static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
|
|
|
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 = {
|
|
|
|
|
|
.freeze = ata_bmdma_freeze,
|
|
|
.thaw = ata_bmdma_thaw,
|
|
|
- .error_handler = piix_sata_error_handler,
|
|
|
+ .error_handler = ata_bmdma_error_handler,
|
|
|
.post_internal_cmd = ata_bmdma_post_internal_cmd,
|
|
|
|
|
|
.irq_handler = ata_interrupt,
|
|
@@ -641,12 +640,6 @@ static void piix_pata_error_handler(struct ata_port *ap)
|
|
|
ata_std_postreset);
|
|
|
}
|
|
|
|
|
|
-static void piix_sata_error_handler(struct ata_port *ap)
|
|
|
-{
|
|
|
- ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, NULL,
|
|
|
- ata_std_postreset);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* piix_set_piomode - Initialize host controller PATA PIO timings
|
|
|
* @ap: Port whose timings we are configuring
|