diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/ata_piix.c | 2 | ||||
-rw-r--r-- | drivers/ata/libata-core.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_at32.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_efar.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_it8213.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_sis.c | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 47892e6f5ded..4b99ed0c59bb 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -837,7 +837,7 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
837 | if (is_slave) { | 837 | if (is_slave) { |
838 | /* clear TIME1|IE1|PPE1|DTE1 */ | 838 | /* clear TIME1|IE1|PPE1|DTE1 */ |
839 | master_data &= 0xff0f; | 839 | master_data &= 0xff0f; |
840 | /* Enable SITRE (seperate slave timing register) */ | 840 | /* Enable SITRE (separate slave timing register) */ |
841 | master_data |= 0x4000; | 841 | master_data |= 0x4000; |
842 | /* enable PPE1, IE1 and TIME1 as needed */ | 842 | /* enable PPE1, IE1 and TIME1 as needed */ |
843 | master_data |= (control << 4); | 843 | master_data |= (control << 4); |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index bdbd55af7022..361cf50cbdea 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -3097,7 +3097,7 @@ static int ata_dev_set_mode(struct ata_device *dev) | |||
3097 | /** | 3097 | /** |
3098 | * ata_do_set_mode - Program timings and issue SET FEATURES - XFER | 3098 | * ata_do_set_mode - Program timings and issue SET FEATURES - XFER |
3099 | * @link: link on which timings will be programmed | 3099 | * @link: link on which timings will be programmed |
3100 | * @r_failed_dev: out paramter for failed device | 3100 | * @r_failed_dev: out parameter for failed device |
3101 | * | 3101 | * |
3102 | * Standard implementation of the function used to tune and set | 3102 | * Standard implementation of the function used to tune and set |
3103 | * ATA device disk transfer mode (PIO3, UDMA6, etc.). If | 3103 | * ATA device disk transfer mode (PIO3, UDMA6, etc.). If |
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 67e574de31e8..db057b183d60 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
@@ -324,7 +324,7 @@ static int __init pata_at32_probe(struct platform_device *pdev) | |||
324 | if (irq < 0) | 324 | if (irq < 0) |
325 | return irq; | 325 | return irq; |
326 | 326 | ||
327 | /* Setup struct containing private infomation */ | 327 | /* Setup struct containing private information */ |
328 | info = kzalloc(sizeof(struct at32_ide_info), GFP_KERNEL); | 328 | info = kzalloc(sizeof(struct at32_ide_info), GFP_KERNEL); |
329 | if (!info) | 329 | if (!info) |
330 | return -ENOMEM; | 330 | return -ENOMEM; |
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index 043dcd35106c..dc33220fe5b2 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c | |||
@@ -135,7 +135,7 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
135 | idetm_data &= 0xCC0F; | 135 | idetm_data &= 0xCC0F; |
136 | idetm_data |= (control << 4); | 136 | idetm_data |= (control << 4); |
137 | 137 | ||
138 | /* Slave timing in seperate register */ | 138 | /* Slave timing in separate register */ |
139 | pci_read_config_byte(dev, 0x44, &slave_data); | 139 | pci_read_config_byte(dev, 0x44, &slave_data); |
140 | slave_data &= 0x0F << shift; | 140 | slave_data &= 0x0F << shift; |
141 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift; | 141 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift; |
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index 1eda821e5e39..e0c2cc29d0ca 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -128,7 +128,7 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
128 | idetm_data &= 0xCC0F; | 128 | idetm_data &= 0xCC0F; |
129 | idetm_data |= (control << 4); | 129 | idetm_data |= (control << 4); |
130 | 130 | ||
131 | /* Slave timing in seperate register */ | 131 | /* Slave timing in separate register */ |
132 | pci_read_config_byte(dev, 0x44, &slave_data); | 132 | pci_read_config_byte(dev, 0x44, &slave_data); |
133 | slave_data &= 0xF0; | 133 | slave_data &= 0xF0; |
134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; | 134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; |
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 87546d9f1ca0..dc7e91562e43 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -345,7 +345,7 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
345 | 345 | ||
346 | if (adev->dma_mode < XFER_UDMA_0) { | 346 | if (adev->dma_mode < XFER_UDMA_0) { |
347 | /* bits 3-0 hold recovery timing bits 8-10 active timing and | 347 | /* bits 3-0 hold recovery timing bits 8-10 active timing and |
348 | the higer bits are dependant on the device */ | 348 | the higher bits are dependant on the device */ |
349 | timing &= ~0x870F; | 349 | timing &= ~0x870F; |
350 | timing |= mwdma_bits[speed]; | 350 | timing |= mwdma_bits[speed]; |
351 | } else { | 351 | } else { |
@@ -385,7 +385,7 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
385 | 385 | ||
386 | if (adev->dma_mode < XFER_UDMA_0) { | 386 | if (adev->dma_mode < XFER_UDMA_0) { |
387 | /* bits 3-0 hold recovery timing bits 8-10 active timing and | 387 | /* bits 3-0 hold recovery timing bits 8-10 active timing and |
388 | the higer bits are dependant on the device, bit 15 udma */ | 388 | the higher bits are dependant on the device, bit 15 udma */ |
389 | timing &= ~0x870F; | 389 | timing &= ~0x870F; |
390 | timing |= mwdma_bits[speed]; | 390 | timing |= mwdma_bits[speed]; |
391 | } else { | 391 | } else { |