gayle: reserve memory resources at once

[karo-tx-linux.git] / drivers / ide / legacy / falconide.c

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 9e449a0c623f78cc82868c2facca4cb9737daf96..1bb2aa72cc7f83d664ba44f1bb25a81e75cff92c 100644 (file)
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -81,6 +81,8 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 
        hw->irq = IRQ_MFP_IDE;
        hw->ack_intr = NULL;
+
+       hw->chipset = ide_generic;
 }
 
     /*
@@ -89,8 +91,8 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 
 static int __init falconide_init(void)
 {
-       hw_regs_t hw;
        ide_hwif_t *hwif;
+       hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
        if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))
                return 0;
@@ -109,15 +111,12 @@ static int __init falconide_init(void)
                u8 index = hwif->index;
                u8 idx[4] = { index, 0xff, 0xff, 0xff };
 
-               ide_init_port_data(hwif, index);
-               ide_init_port_hw(hwif, &hw);
-
                /* Atari has a byte-swapped IDE interface */
                hwif->input_data  = falconide_input_data;
                hwif->output_data = falconide_output_data;
 
                ide_get_lock(NULL, NULL);
-               ide_device_add(idx, NULL);
+               ide_device_add(idx, NULL, hws);
                ide_release_lock();
        }