diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:31 -0400 |
commit | 5d682e4407d8364c286650baafcccae54d4b7c89 (patch) | |
tree | 9aacb4fbecb21c7c2adbe99f431a684a0bd7977b /arch/ppc | |
parent | 7ef8df81def587ddb610b1c6f4572178ce0a97a6 (diff) |
ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
* Call ide_init_default_irq() for pplus in init_ide_data().
* Remove no longer needed pplus_ide_init_hwif_ports().
There should be no functional changes caused by this patch.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/platforms/pplus.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 8a1788c4815..384cdfea70f 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
@@ -695,28 +695,6 @@ static unsigned long pplus_ide_default_io_base(int index) | |||
695 | return 0; | 695 | return 0; |
696 | } | 696 | } |
697 | } | 697 | } |
698 | |||
699 | static void __init | ||
700 | pplus_ide_init_hwif_ports(hw_regs_t * hw, unsigned long data_port, | ||
701 | unsigned long ctrl_port, int *irq) | ||
702 | { | ||
703 | unsigned long reg = data_port; | ||
704 | int i; | ||
705 | |||
706 | for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { | ||
707 | hw->io_ports[i] = reg; | ||
708 | reg += 1; | ||
709 | } | ||
710 | |||
711 | if (ctrl_port) | ||
712 | hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port; | ||
713 | else | ||
714 | hw->io_ports[IDE_CONTROL_OFFSET] = | ||
715 | hw->io_ports[IDE_DATA_OFFSET] + 0x206; | ||
716 | |||
717 | if (irq != NULL) | ||
718 | *irq = pplus_ide_default_irq(data_port); | ||
719 | } | ||
720 | #endif | 698 | #endif |
721 | 699 | ||
722 | #ifdef CONFIG_SMP | 700 | #ifdef CONFIG_SMP |
@@ -887,7 +865,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
887 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | 865 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) |
888 | ppc_ide_md.default_irq = pplus_ide_default_irq; | 866 | ppc_ide_md.default_irq = pplus_ide_default_irq; |
889 | ppc_ide_md.default_io_base = pplus_ide_default_io_base; | 867 | ppc_ide_md.default_io_base = pplus_ide_default_io_base; |
890 | ppc_ide_md.ide_init_hwif = pplus_ide_init_hwif_ports; | ||
891 | #endif | 868 | #endif |
892 | 869 | ||
893 | #ifdef CONFIG_SERIAL_TEXT_DEBUG | 870 | #ifdef CONFIG_SERIAL_TEXT_DEBUG |