libata: set NODEV_HINT for 0x7f status

[safe/jmp/linux-2.6] / drivers / ata / pata_artop.c

diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 698a53c..6b3092c 100644 (file)
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -1,7 +1,7 @@
 /*
  *    pata_artop.c - ARTOP ATA controller driver
  *
- *     (C) 2006 Red Hat <alan@redhat.com>
+ *     (C) 2006 Red Hat
  *     (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based in part on drivers/ide/pci/aec62xx.c
@@ -52,22 +52,7 @@ static int artop6210_pre_reset(struct ata_link *link, unsigned long deadline)
        if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                return -ENOENT;
 
-       return ata_std_prereset(link, deadline);
-}
-
-/**
- *     artop6210_error_handler - Probe specified port on PATA host controller
- *     @ap: Port to probe
- *
- *     LOCKING:
- *     None (inherited from caller).
- */
-
-static void artop6210_error_handler(struct ata_port *ap)
-{
-       ata_bmdma_drive_eh(ap, artop6210_pre_reset,
-                                   ata_std_softreset, NULL,
-                                   ata_std_postreset);
+       return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -93,7 +78,7 @@ static int artop6260_pre_reset(struct ata_link *link, unsigned long deadline)
        if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                return -ENOENT;
 
-       return ata_std_prereset(link, deadline);
+       return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -114,21 +99,6 @@ static int artop6260_cable_detect(struct ata_port *ap)
 }
 
 /**
- *     artop6260_error_handler - Probe specified port on PATA host controller
- *     @ap: Port to probe
- *
- *     LOCKING:
- *     None (inherited from caller).
- */
-
-static void artop6260_error_handler(struct ata_port *ap)
-{
-       ata_bmdma_drive_eh(ap, artop6260_pre_reset,
-                                   ata_std_softreset, NULL,
-                                   ata_std_postreset);
-}
-
-/**
  *     artop6210_load_piomode - Load a set of PATA PIO timings
  *     @ap: Port whose timings we are configuring
  *     @adev: Device
@@ -322,7 +292,7 @@ static struct ata_port_operations artop6210_ops = {
        .cable_detect           = ata_cable_40wire,
        .set_piomode            = artop6210_set_piomode,
        .set_dmamode            = artop6210_set_dmamode,
-       .error_handler          = artop6210_error_handler,
+       .prereset               = artop6210_pre_reset,
 };
 
 static struct ata_port_operations artop6260_ops = {
@@ -330,7 +300,7 @@ static struct ata_port_operations artop6260_ops = {
        .cable_detect           = artop6260_cable_detect,
        .set_piomode            = artop6260_set_piomode,
        .set_dmamode            = artop6260_set_dmamode,
-       .error_handler          = artop6260_error_handler,
+       .prereset               = artop6260_pre_reset,
 };
 
 
@@ -430,7 +400,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 
        BUG_ON(ppi[0] == NULL);
 
-       return ata_pci_init_one(pdev, ppi, &artop_sht);
+       return ata_pci_sff_init_one(pdev, ppi, &artop_sht, NULL);
 }
 
 static const struct pci_device_id artop_pci_tbl[] = {