ide: remove obsoleted "idex=noprobe" kernel parameter
PATCH 1/1 ide: remove obsoleted "idex=noprobe" kernel parameter
* Remove obsoleted "idex=noprobe" kernel parameter.
* Remove no longer needed hwif->noprobe quirk from ide_hwif_configure() and hwif->noprobe checking from cmd640.c.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
goes before "ide: move default IDE ports setup to ide_generic host driver" patch in IDE quilt tree
drivers/ide/ide.c | 6 ++---- drivers/ide/pci/cmd640.c | 3 +-- drivers/ide/setup-pci.c | 7 ------- 3 files changed, 3 insertions(+), 13 deletions(-)
drivers/ide/ide.c +2 -4
@@ -1144,7 +1144,7 @@ static int __init ide_setup(char *s)* (-8, -9, -10) are reserved to ease the hardcoding. */ static const char *ide_words[] = { -"noprobe" ,"serialize" ,"minus3" ,"minus4" , +"minus1" ,"serialize" ,"minus3" ,"minus4" ,"reset" ,"minus6" ,"ata66" ,"minus8" ,"minus9" ,"minus10" ,"four" ,"qd65xx" ,"ht6560b" ,"cmd640_vlb" ,"dtc2278" ,"umc8672" ,"ali14xx" ,NULL };
@@ -1236,9 +1236,7 @@ static int __init ide_setup(char *s) hwif->serialized = hwif->mate->serialized =1 ; goto obsolete_option; -case -1 :/* "noprobe" */ - hwif->noprobe =1 ; - goto obsolete_option; +case -1 :case 0 :case 1 :case 2 :
drivers/ide/pci/cmd640.c +1 -2
@@ -789,8 +789,7 @@ static int __init cmd640x_init(void)/* * Try to enable the secondary interface, if not already enabled */ -if (cmd_hwif1->noprobe || - (cmd_hwif1->drives[0 ].noprobe && cmd_hwif1->drives[1 ].noprobe)) { +if (cmd_hwif1->drives[0 ].noprobe && cmd_hwif1->drives[1 ].noprobe) { port2 ="not probed" ; }else { b =get_cmd640_reg (CNTRL );
drivers/ide/setup-pci.c +0 -7
@@ -345,7 +345,6 @@ static ide_hwif_t *ide_hwif_configure(stunsigned long ctl =0 , base =0 ;ide_hwif_t *hwif;u8 bootable = (d->host_flags &IDE_HFLAG_BOOTABLE ) ?1 :0 ; -u8 oldnoprobe =0 ;struct hw_regs_s hw;if ((d->host_flags &IDE_HFLAG_ISA_PORTS ) ==0 ) {
@@ -376,14 +375,8 @@ static ide_hwif_t *ide_hwif_configure(st hw.chipset = d->chipset ? d->chipset : ide_pci;ide_std_init_ports (&hw, base, ctl |2 ); -if (hwif->io_ports[IDE_DATA_OFFSET ] == base && - hwif->io_ports[IDE_CONTROL_OFFSET ] == (ctl |2 )) - oldnoprobe = hwif->noprobe; -ide_init_port_hw (hwif, &hw); - hwif->noprobe = oldnoprobe; - hwif->dev = &dev->dev; hwif->cds = d;