diff options
Diffstat (limited to 'drivers/ata/pata_radisys.c')
-rw-r--r-- | drivers/ata/pata_radisys.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c index 6f7d0527265f..277f8411b521 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * | 32 | * |
33 | * Set up cable type and use generic probe init | 33 | * Set up cable type and use generic probe init |
34 | */ | 34 | */ |
35 | 35 | ||
36 | static int radisys_pre_reset(struct ata_port *ap) | 36 | static int radisys_pre_reset(struct ata_port *ap) |
37 | { | 37 | { |
38 | ap->cbl = ATA_CBL_PATA80; | 38 | ap->cbl = ATA_CBL_PATA80; |
@@ -122,7 +122,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
122 | struct pci_dev *dev = to_pci_dev(ap->host->dev); | 122 | struct pci_dev *dev = to_pci_dev(ap->host->dev); |
123 | u16 idetm_data; | 123 | u16 idetm_data; |
124 | u8 udma_enable; | 124 | u8 udma_enable; |
125 | 125 | ||
126 | static const /* ISP RTC */ | 126 | static const /* ISP RTC */ |
127 | u8 timings[][2] = { { 0, 0 }, | 127 | u8 timings[][2] = { { 0, 0 }, |
128 | { 0, 0 }, | 128 | { 0, 0 }, |
@@ -154,7 +154,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
154 | 154 | ||
155 | /* Mask out the relevant control and timing bits we will load. Also | 155 | /* Mask out the relevant control and timing bits we will load. Also |
156 | clear the other drive TIME register as a precaution */ | 156 | clear the other drive TIME register as a precaution */ |
157 | 157 | ||
158 | idetm_data &= 0xCCCC; | 158 | idetm_data &= 0xCCCC; |
159 | idetm_data |= control << (4 * adev->devno); | 159 | idetm_data |= control << (4 * adev->devno); |
160 | idetm_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); | 160 | idetm_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); |
@@ -162,18 +162,18 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
162 | udma_enable &= ~(1 << adev->devno); | 162 | udma_enable &= ~(1 << adev->devno); |
163 | } else { | 163 | } else { |
164 | u8 udma_mode; | 164 | u8 udma_mode; |
165 | 165 | ||
166 | /* UDMA66 on: UDMA 33 and 66 are switchable via register 0x4A */ | 166 | /* UDMA66 on: UDMA 33 and 66 are switchable via register 0x4A */ |
167 | 167 | ||
168 | pci_read_config_byte(dev, 0x4A, &udma_mode); | 168 | pci_read_config_byte(dev, 0x4A, &udma_mode); |
169 | 169 | ||
170 | if (adev->xfer_mode == XFER_UDMA_2) | 170 | if (adev->xfer_mode == XFER_UDMA_2) |
171 | udma_mode &= ~ (1 << adev->devno); | 171 | udma_mode &= ~ (1 << adev->devno); |
172 | else /* UDMA 4 */ | 172 | else /* UDMA 4 */ |
173 | udma_mode |= (1 << adev->devno); | 173 | udma_mode |= (1 << adev->devno); |
174 | 174 | ||
175 | pci_write_config_byte(dev, 0x4A, udma_mode); | 175 | pci_write_config_byte(dev, 0x4A, udma_mode); |
176 | 176 | ||
177 | udma_enable |= (1 << adev->devno); | 177 | udma_enable |= (1 << adev->devno); |
178 | } | 178 | } |
179 | pci_write_config_word(dev, 0x40, idetm_data); | 179 | pci_write_config_word(dev, 0x40, idetm_data); |