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/macide.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/macide.c')
-rw-r--r-- | drivers/ide/legacy/macide.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index 1840fede5216..c1b7881c280a 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c | |||
@@ -112,6 +112,7 @@ void __init macide_init(void) | |||
112 | hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); | 112 | hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); |
113 | if (hwif) { | 113 | if (hwif) { |
114 | u8 index = hwif->index; | 114 | u8 index = hwif->index; |
115 | u8 idx[4] = { index, 0xff, 0xff, 0xff }; | ||
115 | 116 | ||
116 | ide_init_port_data(hwif, index); | 117 | ide_init_port_data(hwif, index); |
117 | ide_init_port_hw(hwif, &hw); | 118 | ide_init_port_hw(hwif, &hw); |
@@ -135,5 +136,7 @@ void __init macide_init(void) | |||
135 | printk(KERN_INFO "ide%d: Macintosh Powerbook Baboon IDE interface\n", index); | 136 | printk(KERN_INFO "ide%d: Macintosh Powerbook Baboon IDE interface\n", index); |
136 | else | 137 | else |
137 | printk(KERN_INFO "ide%d: Unknown Macintosh IDE interface\n", index); | 138 | printk(KERN_INFO "ide%d: Unknown Macintosh IDE interface\n", index); |
139 | |||
140 | ide_device_add(idx); | ||
138 | } | 141 | } |
139 | } | 142 | } |