diff options
Diffstat (limited to 'drivers/ide/legacy/q40ide.c')
-rw-r--r-- | drivers/ide/legacy/q40ide.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c index 2dc306f852a6..8fb4438a6afd 100644 --- a/drivers/ide/legacy/q40ide.c +++ b/drivers/ide/legacy/q40ide.c | |||
@@ -131,10 +131,9 @@ static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ | |||
131 | 131 | ||
132 | static int __init q40ide_init(void) | 132 | static int __init q40ide_init(void) |
133 | { | 133 | { |
134 | struct ide_host *host; | ||
134 | int i; | 135 | int i; |
135 | ide_hwif_t *hwif; | ||
136 | hw_regs_t hw[Q40IDE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL }; | 136 | hw_regs_t hw[Q40IDE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL }; |
137 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
138 | 137 | ||
139 | if (!MACH_IS_Q40) | 138 | if (!MACH_IS_Q40) |
140 | return -ENODEV; | 139 | return -ENODEV; |
@@ -158,16 +157,12 @@ static int __init q40ide_init(void) | |||
158 | q40_ide_setup_ports(&hw[i], pcide_bases[i], NULL, | 157 | q40_ide_setup_ports(&hw[i], pcide_bases[i], NULL, |
159 | q40ide_default_irq(pcide_bases[i])); | 158 | q40ide_default_irq(pcide_bases[i])); |
160 | 159 | ||
161 | hwif = ide_find_port(); | 160 | hws[i] = &hw[i]; |
162 | if (hwif) { | ||
163 | hwif->chipset = ide_generic; | ||
164 | |||
165 | hws[i] = &hw[i]; | ||
166 | idx[i] = hwif->index; | ||
167 | } | ||
168 | } | 161 | } |
169 | 162 | ||
170 | ide_device_add(idx, &q40ide_port_info, hws); | 163 | host = ide_host_alloc(&q40ide_port_info, hws); |
164 | if (host) | ||
165 | ide_host_register(host, &q40ide_port_info, hws); | ||
171 | 166 | ||
172 | return 0; | 167 | return 0; |
173 | } | 168 | } |