libata-acpi: fix _GTF command protocol for ATAPI devices

[powerpc.git] / drivers / ata / pata_hpt3x3.c

diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 813485c..ac28ec8 100644 (file)
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -25,25 +25,6 @@
 #define DRV_NAME       "pata_hpt3x3"
 #define DRV_VERSION    "0.4.2"
 
-static int hpt3x3_probe_init(struct ata_port *ap)
-{
-       ap->cbl = ATA_CBL_PATA40;
-       return ata_std_prereset(ap);
-}
-
-/**
- *     hpt3x3_probe_reset      -       reset the hpt3x3 bus
- *     @ap: ATA port to reset
- *
- *     Perform the housekeeping when doing an ATA bus reeset. We just
- *     need to force the cable type.
- */
-
-static void hpt3x3_error_handler(struct ata_port *ap)
-{
-       return ata_bmdma_drive_eh(ap, hpt3x3_probe_init, ata_std_softreset, NULL, ata_std_postreset);
-}
-
 /**
  *     hpt3x3_set_piomode              -       PIO setup
  *     @ap: ATA interface
@@ -139,8 +120,9 @@ static struct ata_port_operations hpt3x3_port_ops = {
 
        .freeze         = ata_bmdma_freeze,
        .thaw           = ata_bmdma_thaw,
-       .error_handler  = hpt3x3_error_handler,
+       .error_handler  = ata_bmdma_error_handler,
        .post_internal_cmd = ata_bmdma_post_internal_cmd,
+       .cable_detect   = ata_cable_40wire,
 
        .bmdma_setup    = ata_bmdma_setup,
        .bmdma_start    = ata_bmdma_start,