diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 19:31:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 19:31:22 -0400 |
commit | 64fb98fc40738ae1a98bcea9ca3145b89fb71524 (patch) | |
tree | 24130f9c56b04638e91969d216db199652470a17 /drivers/ide/pci/opti621.c | |
parent | 5f47c7eac65a45e33d7fe390effe75ec5c74f8bf (diff) | |
parent | 89636af25d75d8672aea05d258be357d0dc4bd70 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
ide: add support for SCSI ioctls to ide-floppy
ide: remove stale changelog from setup-pci.c
ide: remove stale changelog/comments/TODO from ide.c
ide-cris: handle PIO auto-tuning in tune_cris_ide()
ide: add PIO masks
ide: remove ide_find_best_pio_mode()
ide: drop "PIO data" argument from ide_get_best_pio_mode()
ide: ide_find_best_pio_mode() fixes (take 2)
ide: add ide_pio_cycle_time() helper (take 2)
sc1200: remove stale Power Management code
ide: ide_start_power_step() fix WRT disabling DMA
serverworks: fix DMA
serverworks: always tune PIO
ide: add ide_pci_device_t.host_flags (take 2)
ide: add ide_dev_has_iordy() helper (take 4)
ide: make ide_get_best_pio_mode() print info if overriding PIO mode
siimage: PIO mode setup fixes (take 2)
atiixp: PIO mode setup fixes
ide: Stop mapping ROMs
IDE: Remove references to dead ETRAX-related variables.
...
Diffstat (limited to 'drivers/ide/pci/opti621.c')
-rw-r--r-- | drivers/ide/pci/opti621.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index aede7eee9246..3a2bb2723515 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c | |||
@@ -147,12 +147,12 @@ static void compute_pios(ide_drive_t *drive, u8 pio) | |||
147 | int d; | 147 | int d; |
148 | ide_hwif_t *hwif = HWIF(drive); | 148 | ide_hwif_t *hwif = HWIF(drive); |
149 | 149 | ||
150 | drive->drive_data = ide_get_best_pio_mode(drive, pio, OPTI621_MAX_PIO, NULL); | 150 | drive->drive_data = ide_get_best_pio_mode(drive, pio, OPTI621_MAX_PIO); |
151 | for (d = 0; d < 2; ++d) { | 151 | for (d = 0; d < 2; ++d) { |
152 | drive = &hwif->drives[d]; | 152 | drive = &hwif->drives[d]; |
153 | if (drive->present) { | 153 | if (drive->present) { |
154 | if (drive->drive_data == PIO_DONT_KNOW) | 154 | if (drive->drive_data == PIO_DONT_KNOW) |
155 | drive->drive_data = ide_get_best_pio_mode(drive, 255, OPTI621_MAX_PIO, NULL); | 155 | drive->drive_data = ide_get_best_pio_mode(drive, 255, OPTI621_MAX_PIO); |
156 | #ifdef OPTI621_DEBUG | 156 | #ifdef OPTI621_DEBUG |
157 | printk("%s: Selected PIO mode %d\n", | 157 | printk("%s: Selected PIO mode %d\n", |
158 | drive->name, drive->drive_data); | 158 | drive->name, drive->drive_data); |
@@ -350,17 +350,17 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = { | |||
350 | { /* 0 */ | 350 | { /* 0 */ |
351 | .name = "OPTI621", | 351 | .name = "OPTI621", |
352 | .init_hwif = init_hwif_opti621, | 352 | .init_hwif = init_hwif_opti621, |
353 | .channels = 2, | ||
354 | .autodma = AUTODMA, | 353 | .autodma = AUTODMA, |
355 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, | 354 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, |
356 | .bootable = ON_BOARD, | 355 | .bootable = ON_BOARD, |
356 | .pio_mask = ATA_PIO3, | ||
357 | },{ /* 1 */ | 357 | },{ /* 1 */ |
358 | .name = "OPTI621X", | 358 | .name = "OPTI621X", |
359 | .init_hwif = init_hwif_opti621, | 359 | .init_hwif = init_hwif_opti621, |
360 | .channels = 2, | ||
361 | .autodma = AUTODMA, | 360 | .autodma = AUTODMA, |
362 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, | 361 | .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, |
363 | .bootable = ON_BOARD, | 362 | .bootable = ON_BOARD, |
363 | .pio_mask = ATA_PIO3, | ||
364 | } | 364 | } |
365 | }; | 365 | }; |
366 | 366 | ||