ide: skip probing port if "hdx=noprobe" was used for both devices on it
Subsystems (2)
PATCH 1/1 ide: skip probing port if "hdx=noprobe" was used for both devices on it
* Skip probing port if "hdx=noprobe" parameter was used for both devices on it.
* Obsolete "idex=noprobe" parameter - it only works for ide_generic, cmd640 and PCI hosts in Compatibility mode (on alpha/x86/ia64/m32r/mips/ppc32).
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
goes after "ide: remove redundant comment from ide_unregister()" patch in IDE quilt tree
Documentation/ide.txt | 2 -- drivers/ide/ide-probe.c | 3 ++- drivers/ide/ide.c | 2 +- drivers/ide/pci/cmd640.c | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-)
Documentation/ide.txt +0 -2
@@ -258,8 +258,6 @@ Summary of ide driver parameters for ker As for VLB, it is safest to not specify it. Bigger values are safer than smaller ones. - "idex=noprobe" : do not attempt to access/use this interface - "idex=base" : probe for an interface at the addr specified, where "base" is usually 0x1f0 or 0x170 and "ctl" is assumed to be "base"+0x206
drivers/ide/ide-probe.c +2 -1
@@ -756,7 +756,8 @@ static int ide_probe_port(ide_hwif_t *hwBUG_ON (hwif->present); -if (hwif->noprobe) +if (hwif->noprobe || + (hwif->drives[0 ].noprobe && hwif->drives[1 ].noprobe))return -EACCES ;/*
drivers/ide/ide.c +1 -1
@@ -1444,7 +1444,7 @@ static int __init ide_setup(char *s)case -1 :/* "noprobe" */ hwif->noprobe =1 ; - goto done; + goto obsolete_option;case 1 :/* base */ vals[1 ] = vals[0 ] +0x206 ;/* default ctl */
drivers/ide/pci/cmd640.c +2 -1
@@ -787,7 +787,8 @@ static int __init cmd640x_init(void)/* * Try to enable the secondary interface, if not already enabled */ -if (cmd_hwif1->noprobe) { +if (cmd_hwif1->noprobe || + (cmd_hwif1->drives[0 ].noprobe && cmd_hwif1->drives[1 ].noprobe)) { port2 ="not probed" ; }else { b =get_cmd640_reg (CNTRL );