gayle: reserve memory resources at once

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

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 2e84290d0bcc6bacb68142ab7c1e4756568ca876..d839df2239fcbc3ff5ae31b459e7f1d377bdcd18 100644 (file)
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -95,7 +95,7 @@ static int __init macide_init(void)
        ide_ack_intr_t *ack_intr;
        unsigned long base;
        int irq;
-       hw_regs_t hw;
+       hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
        if (!MACH_IS_MAC)
                return -ENODEV;
@@ -130,10 +130,7 @@ static int __init macide_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);
-
-               ide_device_add(idx, NULL);
+               ide_device_add(idx, NULL, hws);
        }
 
        return 0;