1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index b5352ebecef9..d4218310327b 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -40,8 +40,9 @@
 
 static int clock = 0;
 
-static int artop6210_pre_reset(struct ata_port *ap, unsigned long deadline)
+static int artop6210_pre_reset(struct ata_link *link, unsigned long deadline)
 {
+        struct ata_port *ap = link->ap;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         const struct pci_bits artop_enable_bits[] = {
                 { 0x4AU, 1U, 0x02UL, 0x02UL },  /* port 0 */
@@ -51,7 +52,7 @@ static int artop6210_pre_reset(struct ata_port *ap, unsigned long deadline)
         if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap, deadline);
+        return ata_std_prereset(link, deadline);
 }
 
 /**
@@ -71,27 +72,28 @@ static void artop6210_error_handler(struct ata_port *ap)
 
 /**
  *      artop6260_pre_reset     -       check for 40/80 pin
- *      @ap: Port
+ *      @link: link
  *      @deadline: deadline jiffies for the operation
  *
  *      The ARTOP hardware reports the cable detect bits in register 0x49.
  *      Nothing complicated needed here.
  */
 
-static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline)
+static int artop6260_pre_reset(struct ata_link *link, unsigned long deadline)
 {
         static const struct pci_bits artop_enable_bits[] = {
                 { 0x4AU, 1U, 0x02UL, 0x02UL },  /* port 0 */
                 { 0x4AU, 1U, 0x04UL, 0x04UL },  /* port 1 */
         };
 
+        struct ata_port *ap = link->ap;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
         /* Odd numbered device ids are the units with enable bits (the -R cards) */
         if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
                 return -ENOENT;
 
-        return ata_std_prereset(ap, deadline);
+        return ata_std_prereset(link, deadline);
 }
 
 /**
@@ -330,7 +332,6 @@ static struct scsi_host_template artop_sht = {
 };
 
 static const struct ata_port_operations artop6210_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = artop6210_set_piomode,
         .set_dmamode            = artop6210_set_dmamode,
         .mode_filter            = ata_pci_default_filter,
@@ -359,13 +360,11 @@ static const struct ata_port_operations artop6210_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
-        .port_start             = ata_port_start,
+        .port_start             = ata_sff_port_start,
 };
 
 static const struct ata_port_operations artop6260_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = artop6260_set_piomode,
         .set_dmamode            = artop6260_set_dmamode,
 
@@ -392,9 +391,8 @@ static const struct ata_port_operations artop6260_ops = {
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
-        .port_start             = ata_port_start,
+        .port_start             = ata_sff_port_start,
 };