V4L/DVB (7901): zoran: use correct type for CPU flags

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

diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index dab54f8a272d6502d056575f6e4d02106a79aca5..7d7e3fdab71fae0ce080c791dfd320d8f45218c1 100644 (file)
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -55,21 +55,7 @@ static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline)
        if (!pci_test_config_bits(pdev, &mpiix_enable_bits))
                return -ENOENT;
 
-       return ata_std_prereset(link, deadline);
-}
-
-/**
- *     mpiix_error_handler             -       probe reset
- *     @ap: ATA port
- *
- *     Perform the ATA probe and bus reset sequence plus specific handling
- *     for this hardware. The MPIIX has the enable bits in a different place
- *     to PIIX4 and friends. As a pure PIO device it has no cable detect
- */
-
-static void mpiix_error_handler(struct ata_port *ap)
-{
-       ata_bmdma_drive_eh(ap, mpiix_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
+       return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -83,8 +69,8 @@ static void mpiix_error_handler(struct ata_port *ap)
  *
  *     This would get very ugly because we can only program timing for one
  *     device at a time, the other gets PIO0. Fortunately libata calls
- *     our qc_issue_prot command before a command is issued so we can
- *     flip the timings back and forth to reduce the pain.
+ *     our qc_issue command before a command is issued so we can flip the
+ *     timings back and forth to reduce the pain.
  */
 
 static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
@@ -124,7 +110,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *     mpiix_qc_issue_prot     -       command issue
+ *     mpiix_qc_issue          -       command issue
  *     @qc: command pending
  *
  *     Called when the libata layer is about to issue a command. We wrap
@@ -134,7 +120,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
  *     be made PIO0.
  */
 
-static unsigned int mpiix_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int mpiix_qc_issue(struct ata_queued_cmd *qc)
 {
        struct ata_port *ap = qc->ap;
        struct ata_device *adev = qc->dev;
@@ -147,7 +133,7 @@ static unsigned int mpiix_qc_issue_prot(struct ata_queued_cmd *qc)
        if (adev->pio_mode && adev != ap->private_data)
                mpiix_set_piomode(ap, adev);
 
-       return ata_qc_issue_prot(qc);
+       return ata_sff_qc_issue(qc);
 }
 
 static struct scsi_host_template mpiix_sht = {
@@ -156,10 +142,10 @@ static struct scsi_host_template mpiix_sht = {
 
 static struct ata_port_operations mpiix_port_ops = {
        .inherits       = &ata_sff_port_ops,
-       .qc_issue       = mpiix_qc_issue_prot,
+       .qc_issue       = mpiix_qc_issue,
        .cable_detect   = ata_cable_40wire,
        .set_piomode    = mpiix_set_piomode,
-       .error_handler  = mpiix_error_handler,
+       .prereset       = mpiix_pre_reset,
 };
 
 static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
@@ -221,10 +207,10 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
        ap->ioaddr.altstatus_addr = ctl_addr;
 
        /* Let libata fill in the port details */
-       ata_std_ports(&ap->ioaddr);
+       ata_sff_std_ports(&ap->ioaddr);
 
        /* activate host */
-       return ata_host_activate(host, irq, ata_interrupt, IRQF_SHARED,
+       return ata_host_activate(host, irq, ata_sff_interrupt, IRQF_SHARED,
                                 &mpiix_sht);
 }