Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[cascardo/linux.git] / drivers / ata / pata_it8213.c

diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
index 998af0e..cf9164d 100644 (file)
--- a/drivers/ata/pata_it8213.c
+++ b/drivers/ata/pata_it8213.c
@@ -76,8 +76,8 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev)
 {
        unsigned int pio        = adev->pio_mode - XFER_PIO_0;
        struct pci_dev *dev     = to_pci_dev(ap->host->dev);
-       unsigned int idetm_port= ap->port_no ? 0x42 : 0x40;
-       u16 idetm_data;
+       unsigned int master_port = ap->port_no ? 0x42 : 0x40;
+       u16 master_data;
        int control = 0;
 
        /*
@@ -100,19 +100,19 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev)
        if (adev->class != ATA_DEV_ATA)
                control |= 4;   /* PPE */
 
-       pci_read_config_word(dev, idetm_port, &idetm_data);
+       pci_read_config_word(dev, master_port, &master_data);
 
        /* Set PPE, IE, and TIME as appropriate */
        if (adev->devno == 0) {
-               idetm_data &= 0xCCF0;
-               idetm_data |= control;
-               idetm_data |= (timings[pio][0] << 12) |
+               master_data &= 0xCCF0;
+               master_data |= control;
+               master_data |= (timings[pio][0] << 12) |
                        (timings[pio][1] << 8);
        } else {
                u8 slave_data;
 
-               idetm_data &= 0xFF0F;
-               idetm_data |= (control << 4);
+               master_data &= 0xFF0F;
+               master_data |= (control << 4);
 
                /* Slave timing in separate register */
                pci_read_config_byte(dev, 0x44, &slave_data);
@@ -121,8 +121,8 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev)
                pci_write_config_byte(dev, 0x44, slave_data);
        }
 
-       idetm_data |= 0x4000;   /* Ensure SITRE is set */
-       pci_write_config_word(dev, idetm_port, idetm_data);
+       master_data |= 0x4000;  /* Ensure SITRE is set */
+       pci_write_config_word(dev, master_port, master_data);
 }
 
 /**
@@ -163,7 +163,7 @@ static void it8213_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 
                /* Clocks follow the PIIX style */
                u_speed = min(2 - (udma & 1), udma);
-               if (udma == 5)
+               if (udma > 4)
                        u_clock = 0x1000;       /* 100Mhz */
                else if (udma > 2)
                        u_clock = 1;            /* 66Mhz */
@@ -262,7 +262,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en
                .flags          = ATA_FLAG_SLAVE_POSS,
                .pio_mask       = ATA_PIO4,
                .mwdma_mask     = ATA_MWDMA12_ONLY,
-               .udma_mask      = ATA_UDMA4, /* FIXME: want UDMA 100? */
+               .udma_mask      = ATA_UDMA6,
                .port_ops       = &it8213_ops,
        };
        /* Current IT8213 stuff is single port */