Blackfin: fix cache Kconfig typo

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

diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 0e1c2c1..ca5cad0 100644 (file)
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -152,18 +152,18 @@ static struct ata_port_info pdc2027x_port_info[] = {
        {
                .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
                                  ATA_FLAG_MMIO,
-               .pio_mask       = 0x1f, /* pio0-4 */
-               .mwdma_mask     = 0x07, /* mwdma0-2 */
-               .udma_mask      = ATA_UDMA5, /* udma0-5 */
+               .pio_mask       = ATA_PIO4,
+               .mwdma_mask     = ATA_MWDMA2,
+               .udma_mask      = ATA_UDMA5,
                .port_ops       = &pdc2027x_pata100_ops,
        },
        /* PDC_UDMA_133 */
        {
                .flags          = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS |
                                  ATA_FLAG_MMIO,
-               .pio_mask       = 0x1f, /* pio0-4 */
-               .mwdma_mask     = 0x07, /* mwdma0-2 */
-               .udma_mask      = ATA_UDMA6, /* udma0-6 */
+               .pio_mask       = ATA_PIO4,
+               .mwdma_mask     = ATA_MWDMA2,
+               .udma_mask      = ATA_UDMA6,
                .port_ops       = &pdc2027x_pata133_ops,
        },
 };
@@ -281,7 +281,6 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
  *     pdc2027x_set_piomode - Initialize host controller PATA PIO timings
  *     @ap: Port to configure
  *     @adev: um
- *     @pio: PIO mode, 0 - 4
  *
  *     Set PIO mode for device.
  *
@@ -326,7 +325,6 @@ static void pdc2027x_set_piomode(struct ata_port *ap, struct ata_device *adev)
  *     pdc2027x_set_dmamode - Initialize host controller PATA UDMA timings
  *     @ap: Port to configure
  *     @adev: um
- *     @udma: udma mode, XFER_UDMA_0 to XFER_UDMA_6
  *
  *     Set UDMA mode for device.
  *
@@ -406,23 +404,20 @@ static int pdc2027x_set_mode(struct ata_link *link, struct ata_device **r_failed
        if (rc < 0)
                return rc;
 
-       ata_link_for_each_dev(dev, link) {
-               if (ata_dev_enabled(dev)) {
+       ata_for_each_dev(dev, link, ENABLED) {
+               pdc2027x_set_piomode(ap, dev);
 
-                       pdc2027x_set_piomode(ap, dev);
+               /*
+                * Enable prefetch if the device support PIO only.
+                */
+               if (dev->xfer_shift == ATA_SHIFT_PIO) {
+                       u32 ctcr1 = ioread32(dev_mmio(ap, dev, PDC_CTCR1));
+                       ctcr1 |= (1 << 25);
+                       iowrite32(ctcr1, dev_mmio(ap, dev, PDC_CTCR1));
 
-                       /*
-                        * Enable prefetch if the device support PIO only.
-                        */
-                       if (dev->xfer_shift == ATA_SHIFT_PIO) {
-                               u32 ctcr1 = ioread32(dev_mmio(ap, dev, PDC_CTCR1));
-                               ctcr1 |= (1 << 25);
-                               iowrite32(ctcr1, dev_mmio(ap, dev, PDC_CTCR1));
-
-                               PDPRINTK("Turn on prefetch\n");
-                       } else {
-                               pdc2027x_set_dmamode(ap, dev);
-                       }
+                       PDPRINTK("Turn on prefetch\n");
+               } else {
+                       pdc2027x_set_dmamode(ap, dev);
                }
        }
        return 0;