ata: Switch all my stuff to a common address

[linux-2.6-omap-h63xx.git] / drivers / ata / pata_optidma.c

diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 36ac147de1789554c25bda6a1b5dbebb9d749f1f..93bb6e91973f46807bfa479a7e5ab47365b3bc55 100644 (file)
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -1,7 +1,6 @@
 /*
  * pata_optidma.c      - Opti DMA PATA for new ATA layer
  *                       (C) 2006 Red Hat Inc
- *                       Alan Cox <alan@redhat.com>
  *
  *     The Opti DMA controllers are related to the older PIO PCI controllers
  *     and indeed the VLB ones. The main differences are that the timing
@@ -64,7 +63,7 @@ static int optidma_pre_reset(struct ata_link *link, unsigned long deadline)
        if (ap->port_no && !pci_test_config_bits(pdev, &optidma_enable_bits))
                return -ENOENT;
 
-       return ata_std_prereset(link, deadline);
+       return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -430,7 +429,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
        if (optiplus_with_udma(dev))
                ppi[0] = &info_82c700_udma;
 
-       return ata_pci_init_one(dev, ppi, &optidma_sht, NULL);
+       return ata_pci_sff_init_one(dev, ppi, &optidma_sht, NULL);
 }
 
 static const struct pci_device_id optidma[] = {