pata: cable methods

Versus upstream as requested

Last of the trivial switches to cable_detect methods.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 1572e5c9031a..08cccc9c659b 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -70,36 +70,23 @@
 #define CS5535_BAD_PIO(timings) ( (timings&~0x80000000UL)==0x00009172 )
 
 /**
- *      cs5535_pre_reset        -       detect cable type
+ *      cs5535_cable_detect     -       detect cable type
  *      @ap: Port to detect on
  *
  *      Perform cable detection for ATA66 capable cable. Return a libata
  *      cable type.
  */
 
-static int cs5535_pre_reset(struct ata_port *ap)
+static int cs5535_cable_detect(struct ata_port *ap)
 {
         u8 cable;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
         pci_read_config_byte(pdev, CS5535_CABLE_DETECT, &cable);
         if (cable & 1)
-                ap->cbl = ATA_CBL_PATA80;
+                return ATA_CBL_PATA80;
         else
-                ap->cbl = ATA_CBL_PATA40;
-        return ata_std_prereset(ap);
-}
-
-/**
- *      cs5535_error_handler            -       reset/probe
- *      @ap: Port to reset
- *
- *      Reset and configure a port
- */
-
-static void cs5535_error_handler(struct ata_port *ap)
-{
-        ata_bmdma_drive_eh(ap, cs5535_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
+                return ATA_CBL_PATA40;
 }
 
 /**
@@ -205,8 +192,9 @@ static struct ata_port_operations cs5535_port_ops = {
 
         .freeze         = ata_bmdma_freeze,
         .thaw           = ata_bmdma_thaw,
-        .error_handler  = cs5535_error_handler,
+        .error_handler  = ata_bmdma_error_handler,
         .post_internal_cmd = ata_bmdma_post_internal_cmd,
+        .cable_detect   = cs5535_cable_detect,
 
         .bmdma_setup    = ata_bmdma_setup,
         .bmdma_start    = ata_bmdma_start,