diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:06 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:06 -0500 |
commit | 8ac4ce742c66100931b6f2d7a36b0df08bc721fe (patch) | |
tree | bc44edb8d6ec9057d24aa4c986729e1ca9f3f860 /drivers/ide/legacy/q40ide.c | |
parent | ac87e41116c229fc1efaac0d17fdbfb2185e4629 (diff) |
ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)
* Add mpc8xx_ide_probe() to mpc8xx.c and call it from probe_for_hwifs().
* Convert ide_arm, ide-cris, ide-h8300, ide-pnp, buddha, falconide, gayle,
macide, q40ide, cmd640 and mpc8xx host drivers to use ide_device_add().
This removes dependency on ide_generic for these drivers so update
ide/Kconfig accordingly.
v2:
* ide_arm build fix (s/ide_device_idx/ide_device_add/)
(Thanks to Christoph Lameter <clameter@sgi.com> for reporting the problem).
Cc: Mikael Starvik <starvik@axis.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy/q40ide.c')
-rw-r--r-- | drivers/ide/legacy/q40ide.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c index 31e54ffdfee4..2082e9c6efd9 100644 --- a/drivers/ide/legacy/q40ide.c +++ b/drivers/ide/legacy/q40ide.c | |||
@@ -116,6 +116,7 @@ void __init q40ide_init(void) | |||
116 | int i; | 116 | int i; |
117 | ide_hwif_t *hwif; | 117 | ide_hwif_t *hwif; |
118 | const char *name; | 118 | const char *name; |
119 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
119 | 120 | ||
120 | if (!MACH_IS_Q40) | 121 | if (!MACH_IS_Q40) |
121 | return ; | 122 | return ; |
@@ -146,7 +147,11 @@ void __init q40ide_init(void) | |||
146 | ide_init_port_data(hwif, hwif->index); | 147 | ide_init_port_data(hwif, hwif->index); |
147 | ide_init_port_hw(hwif, &hw); | 148 | ide_init_port_hw(hwif, &hw); |
148 | hwif->mmio = 1; | 149 | hwif->mmio = 1; |
150 | |||
151 | idx[i] = hwif->index; | ||
149 | } | 152 | } |
150 | } | 153 | } |
154 | |||
155 | ide_device_add(idx); | ||
151 | } | 156 | } |
152 | 157 | ||