diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:21 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:21 -0400 |
commit | 4f0eee4d877e3b617b6a22d209d52b3dfca2b2a7 (patch) | |
tree | 87603afcdc56a97b0a32e7d1fab2ea588fc36da4 /drivers/ide/ide.c | |
parent | 2625cd52b6eafb63b72f2e53f933f41ba9e34dff (diff) |
ide: use ide_find_port() instead of ide_deprecated_find_port()
* Use ide_find_port() instead of ide_deprecated_find_port() in bast-ide/
palm_bk3710/ide-cs/delkin_cb host drivers and in ide_register_hw().
* Remove no longer needed ide_deprecated_find_port().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 67ce697a9d51..bd5ff7d987d0 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -618,31 +618,6 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw) | |||
618 | } | 618 | } |
619 | EXPORT_SYMBOL_GPL(ide_init_port_hw); | 619 | EXPORT_SYMBOL_GPL(ide_init_port_hw); |
620 | 620 | ||
621 | ide_hwif_t *ide_deprecated_find_port(unsigned long base) | ||
622 | { | ||
623 | ide_hwif_t *hwif; | ||
624 | int i; | ||
625 | |||
626 | for (i = 0; i < MAX_HWIFS; i++) { | ||
627 | hwif = &ide_hwifs[i]; | ||
628 | if (hwif->io_ports[IDE_DATA_OFFSET] == base) | ||
629 | goto found; | ||
630 | } | ||
631 | |||
632 | for (i = 0; i < MAX_HWIFS; i++) { | ||
633 | hwif = &ide_hwifs[i]; | ||
634 | if (hwif->hold) | ||
635 | continue; | ||
636 | if (!hwif->present && hwif->mate == NULL) | ||
637 | goto found; | ||
638 | } | ||
639 | |||
640 | hwif = NULL; | ||
641 | found: | ||
642 | return hwif; | ||
643 | } | ||
644 | EXPORT_SYMBOL_GPL(ide_deprecated_find_port); | ||
645 | |||
646 | /** | 621 | /** |
647 | * ide_register_hw - register IDE interface | 622 | * ide_register_hw - register IDE interface |
648 | * @hw: hardware registers | 623 | * @hw: hardware registers |
@@ -662,7 +637,7 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), | |||
662 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 637 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
663 | 638 | ||
664 | do { | 639 | do { |
665 | hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]); | 640 | hwif = ide_find_port(hw->io_ports[IDE_DATA_OFFSET]); |
666 | if (hwif) | 641 | if (hwif) |
667 | goto found; | 642 | goto found; |
668 | for (index = 0; index < MAX_HWIFS; index++) | 643 | for (index = 0; index < MAX_HWIFS; index++) |