diff options
Diffstat (limited to 'drivers/ide/legacy/ide-4drives.c')
-rw-r--r-- | drivers/ide/legacy/ide-4drives.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c index 6310dc50e3c5..5935153ef2ad 100644 --- a/drivers/ide/legacy/ide-4drives.c +++ b/drivers/ide/legacy/ide-4drives.c | |||
@@ -28,10 +28,9 @@ static const struct ide_port_info ide_4drives_port_info = { | |||
28 | 28 | ||
29 | static int __init ide_4drives_init(void) | 29 | static int __init ide_4drives_init(void) |
30 | { | 30 | { |
31 | ide_hwif_t *hwif, *mate; | 31 | struct ide_host *host; |
32 | unsigned long base = 0x1f0, ctl = 0x3f6; | 32 | unsigned long base = 0x1f0, ctl = 0x3f6; |
33 | hw_regs_t hw, *hws[] = { NULL, NULL, NULL, NULL }; | 33 | hw_regs_t hw, *hws[] = { &hw, &hw, NULL, NULL }; |
34 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
35 | 34 | ||
36 | if (probe_4drives == 0) | 35 | if (probe_4drives == 0) |
37 | return -ENODEV; | 36 | return -ENODEV; |
@@ -55,21 +54,9 @@ static int __init ide_4drives_init(void) | |||
55 | hw.irq = 14; | 54 | hw.irq = 14; |
56 | hw.chipset = ide_4drives; | 55 | hw.chipset = ide_4drives; |
57 | 56 | ||
58 | hwif = ide_find_port(); | 57 | host = ide_host_alloc(&ide_4drives_port_info, hws); |
59 | if (hwif) { | 58 | if (host) |
60 | hwif->chipset = ide_4drives; | 59 | ide_host_register(host, &ide_4drives_port_info, hws); |
61 | |||
62 | hws[0] = &hw; | ||
63 | idx[0] = hwif->index; | ||
64 | } | ||
65 | |||
66 | mate = ide_find_port(); | ||
67 | if (mate) { | ||
68 | hws[1] = &hw; | ||
69 | idx[1] = mate->index; | ||
70 | } | ||
71 | |||
72 | ide_device_add(idx, &ide_4drives_port_info, hws); | ||
73 | 60 | ||
74 | return 0; | 61 | return 0; |
75 | } | 62 | } |