pata_radisys: fix UDMA handling

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

diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 9ab84fc..4fd25e7 100644 (file)
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -1,7 +1,7 @@
 /*
  *    pata_radisys.c - Intel PATA/SATA controllers
  *
- *     (C) 2006 Red Hat <alan@redhat.com>
+ *     (C) 2006 Red Hat <alan@lxorguk.ukuu.org.uk>
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
@@ -81,7 +81,6 @@ static void radisys_set_piomode (struct ata_port *ap, struct ata_device *adev)
  *     radisys_set_dmamode - Initialize host controller PATA DMA timings
  *     @ap: Port whose timings we are configuring
  *     @adev: Device to program
- *     @isich: True if the device is an ICH and has IOCFG registers
  *
  *     Set MWDMA mode for device, in host controller PCI config space.
  *
@@ -140,9 +139,9 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
                pci_read_config_byte(dev, 0x4A, &udma_mode);
 
                if (adev->xfer_mode == XFER_UDMA_2)
-                       udma_mode &= ~ (1 << adev->devno);
+                       udma_mode &= ~(2 << (adev->devno * 4));
                else /* UDMA 4 */
-                       udma_mode |= (1 << adev->devno);
+                       udma_mode |= (2 << (adev->devno * 4));
 
                pci_write_config_byte(dev, 0x4A, udma_mode);
 
@@ -156,7 +155,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *     radisys_qc_issue_prot   -       command issue
+ *     radisys_qc_issue        -       command issue
  *     @qc: command pending
  *
  *     Called when the libata layer is about to issue a command. We wrap
@@ -166,7 +165,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
  *     be made PIO0.
  */
 
-static unsigned int radisys_qc_issue_prot(struct ata_queued_cmd *qc)
+static unsigned int radisys_qc_issue(struct ata_queued_cmd *qc)
 {
        struct ata_port *ap = qc->ap;
        struct ata_device *adev = qc->dev;
@@ -180,7 +179,7 @@ static unsigned int radisys_qc_issue_prot(struct ata_queued_cmd *qc)
                                radisys_set_piomode(ap, adev);
                }
        }
-       return ata_qc_issue_prot(qc);
+       return ata_sff_qc_issue(qc);
 }
 
 
@@ -190,7 +189,7 @@ static struct scsi_host_template radisys_sht = {
 
 static struct ata_port_operations radisys_pata_ops = {
        .inherits               = &ata_bmdma_port_ops,
-       .qc_issue               = radisys_qc_issue_prot,
+       .qc_issue               = radisys_qc_issue,
        .cable_detect           = ata_cable_unknown,
        .set_piomode            = radisys_set_piomode,
        .set_dmamode            = radisys_set_dmamode,
@@ -217,9 +216,9 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e
        static int printed_version;
        static const struct ata_port_info info = {
                .flags          = ATA_FLAG_SLAVE_POSS,
-               .pio_mask       = 0x1f, /* pio0-4 */
-               .mwdma_mask     = 0x07, /* mwdma1-2 */
-               .udma_mask      = 0x14, /* UDMA33/66 only */
+               .pio_mask       = ATA_PIO4,
+               .mwdma_mask     = ATA_MWDMA12_ONLY,
+               .udma_mask      = ATA_UDMA24_ONLY,
                .port_ops       = &radisys_pata_ops,
        };
        const struct ata_port_info *ppi[] = { &info, NULL };
@@ -228,7 +227,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                dev_printk(KERN_DEBUG, &pdev->dev,
                           "version " DRV_VERSION "\n");
 
-       return ata_pci_init_one(pdev, ppi, &radisys_sht, NULL);
+       return ata_pci_sff_init_one(pdev, ppi, &radisys_sht, NULL);
 }
 
 static const struct pci_device_id radisys_pci_tbl[] = {