diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:58 -0400 |
commit | 2134758d2a5429325cee4d4ce8959af5314eeba1 (patch) | |
tree | cc0d1326c04522e70c1f52598c9aba29aa85170f /drivers/ide/ppc | |
parent | e5fa4b2968ff0f32b5ecfa082fd6db50b731055e (diff) |
ide: drop "PIO data" argument from ide_get_best_pio_mode()
* Drop no longer needed "PIO data" argument from ide_get_best_pio_mode()
and convert all users accordingly.
* Remove no longer needed ide_pio_data_t.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r-- | drivers/ide/ppc/mpc8xx.c | 3 | ||||
-rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 82de2d781f2e..f3789c0e6cc9 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
@@ -431,13 +431,12 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw, | |||
431 | static void | 431 | static void |
432 | m8xx_ide_tuneproc(ide_drive_t *drive, u8 pio) | 432 | m8xx_ide_tuneproc(ide_drive_t *drive, u8 pio) |
433 | { | 433 | { |
434 | ide_pio_data_t d; | ||
435 | #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) | 434 | #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) |
436 | volatile pcmconf8xx_t *pcmp; | 435 | volatile pcmconf8xx_t *pcmp; |
437 | ulong timing, mask, reg; | 436 | ulong timing, mask, reg; |
438 | #endif | 437 | #endif |
439 | 438 | ||
440 | pio = ide_get_best_pio_mode(drive, pio, 4, &d); | 439 | pio = ide_get_best_pio_mode(drive, pio, 4); |
441 | 440 | ||
442 | #if 1 | 441 | #if 1 |
443 | printk("%s[%d] %s: best PIO mode: %d\n", | 442 | printk("%s[%d] %s: best PIO mode: %d\n", |
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 669330521fc1..debaa8823f51 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -627,7 +627,7 @@ pmac_ide_tuneproc(ide_drive_t *drive, u8 pio) | |||
627 | /* which drive is it ? */ | 627 | /* which drive is it ? */ |
628 | timings = &pmif->timings[drive->select.b.unit & 0x01]; | 628 | timings = &pmif->timings[drive->select.b.unit & 0x01]; |
629 | 629 | ||
630 | pio = ide_get_best_pio_mode(drive, pio, 4, NULL); | 630 | pio = ide_get_best_pio_mode(drive, pio, 4); |
631 | cycle_time = ide_pio_cycle_time(drive, pio); | 631 | cycle_time = ide_pio_cycle_time(drive, pio); |
632 | 632 | ||
633 | switch (pmif->kind) { | 633 | switch (pmif->kind) { |