include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

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

diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index d337f32..1ea2be0 100644 (file)
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -1,7 +1,7 @@
 /*
  *     ACPI PATA driver
  *
- *     (c) 2007 Red Hat  <alan@redhat.com>
+ *     (c) 2007 Red Hat
  */
 
 #include <linux/kernel.h>
@@ -11,14 +11,9 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/gfp.h>
 #include <scsi/scsi_host.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/acnames.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acexcep.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
 
 #include <linux/libata.h>
 #include <linux/ata.h>
@@ -47,7 +42,7 @@ static int pacpi_pre_reset(struct ata_link *link, unsigned long deadline)
        if (ap->acpi_handle == NULL || ata_acpi_gtm(ap, &acpi->gtm) < 0)
                return -ENODEV;
 
-       return ata_std_prereset(link, deadline);
+       return ata_sff_prereset(link, deadline);
 }
 
 /**
@@ -106,7 +101,7 @@ static unsigned long pacpi_discover_modes(struct ata_port *ap, struct ata_device
 static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long mask)
 {
        struct pata_acpi *acpi = adev->link->ap->private_data;
-       return ata_pci_default_filter(adev, mask & acpi->mask[adev->devno]);
+       return ata_bmdma_mode_filter(adev, mask & acpi->mask[adev->devno]);
 }
 
 /**
@@ -162,30 +157,30 @@ static void pacpi_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *     pacpi_qc_issue_prot     -       command issue
+ *     pacpi_qc_issue  -       command issue
  *     @qc: command pending
  *
  *     Called when the libata layer is about to issue a command. We wrap
  *     this interface so that we can load the correct ATA timings if
- *     neccessary.
+ *     necessary.
  */
 
-static unsigned int pacpi_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
 {
        struct ata_port *ap = qc->ap;
        struct ata_device *adev = qc->dev;
        struct pata_acpi *acpi = ap->private_data;
 
        if (acpi->gtm.flags & 0x10)
-               return ata_qc_issue_prot(qc);
+               return ata_sff_qc_issue(qc);
 
        if (adev != acpi->last) {
                pacpi_set_piomode(ap, adev);
-               if (adev->dma_mode)
+               if (ata_dma_enabled(adev))
                        pacpi_set_dmamode(ap, adev);
                acpi->last = adev;
        }
-       return ata_qc_issue_prot(qc);
+       return ata_sff_qc_issue(qc);
 }
 
 /**
@@ -223,7 +218,7 @@ static struct scsi_host_template pacpi_sht = {
 
 static struct ata_port_operations pacpi_ops = {
        .inherits               = &ata_bmdma_port_ops,
-       .qc_issue               = pacpi_qc_issue_prot,
+       .qc_issue               = pacpi_qc_issue,
        .cable_detect           = pacpi_cable_detect,
        .mode_filter            = pacpi_mode_filter,
        .set_piomode            = pacpi_set_piomode,
@@ -252,14 +247,20 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
        static const struct ata_port_info info = {
                .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
 
-               .pio_mask       = 0x1f,
-               .mwdma_mask     = 0x07,
-               .udma_mask      = 0x7f,
+               .pio_mask       = ATA_PIO4,
+               .mwdma_mask     = ATA_MWDMA2,
+               .udma_mask      = ATA_UDMA6,
 
                .port_ops       = &pacpi_ops,
        };
        const struct ata_port_info *ppi[] = { &info, NULL };
-       return ata_pci_init_one(pdev, ppi, &pacpi_sht, NULL);
+       if (pdev->vendor == PCI_VENDOR_ID_ATI) {
+               int rc = pcim_enable_device(pdev);
+               if (rc < 0)
+                       return rc;
+               pcim_pin_device(pdev);
+       }
+       return ata_pci_sff_init_one(pdev, ppi, &pacpi_sht, NULL, 0);
 }
 
 static const struct pci_device_id pacpi_pci_tbl[] = {