Commit 8a26e0fb authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] remove old style probe from other legacy ide

parent 04b55057
...@@ -256,10 +256,9 @@ int __init setup_pdc4030(ide_hwif_t *hwif) ...@@ -256,10 +256,9 @@ int __init setup_pdc4030(ide_hwif_t *hwif)
if (!ident.current_tm[i+2].cyl) if (!ident.current_tm[i+2].cyl)
hwif2->drives[i].noprobe = 1; hwif2->drives[i].noprobe = 1;
} }
#ifndef HWIF_PROBE_CLASSIC_METHOD
probe_hwif_init(&ide_hwifs[hwif->index]); probe_hwif_init(&ide_hwifs[hwif->index]);
probe_hwif_init(&ide_hwifs[hwif2->index]); probe_hwif_init(&ide_hwifs[hwif2->index]);
#endif /* HWIF_PROBE_CLASSIC_METHOD */
return 1; return 1;
} }
......
...@@ -359,9 +359,7 @@ void __init qd_setup (int unit, int base, int config, unsigned int data0, unsign ...@@ -359,9 +359,7 @@ void __init qd_setup (int unit, int base, int config, unsigned int data0, unsign
hwif->drives[0].io_32bit = hwif->drives[0].io_32bit =
hwif->drives[1].io_32bit = 1; hwif->drives[1].io_32bit = 1;
hwif->tuneproc = tuneproc; hwif->tuneproc = tuneproc;
#ifndef HWIF_PROBE_CLASSIC_METHOD
probe_hwif_init(hwif); probe_hwif_init(hwif);
#endif /* HWIF_PROBE_CLASSIC_METHOD */
} }
/* /*
......
...@@ -162,10 +162,8 @@ int __init probe_umc8672 (void) ...@@ -162,10 +162,8 @@ int __init probe_umc8672 (void)
ide_hwifs[1].mate = &ide_hwifs[0]; ide_hwifs[1].mate = &ide_hwifs[0];
ide_hwifs[1].channel = 1; ide_hwifs[1].channel = 1;
#ifndef HWIF_PROBE_CLASSIC_METHOD
probe_hwif_init(&ide_hwifs[0]); probe_hwif_init(&ide_hwifs[0]);
probe_hwif_init(&ide_hwifs[1]); probe_hwif_init(&ide_hwifs[1]);
#endif /* HWIF_PROBE_CLASSIC_METHOD */
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment