patch-2.4.8 linux/drivers/s390/s390dyn.c
Next file: linux/drivers/s390/s390io.c
Previous file: linux/drivers/s390/net/netiucv.c
Back to the patch index
Back to the overall index
- Lines: 47
- Date:
Wed Jul 25 14:12:02 2001
- Orig file:
v2.4.7/linux/drivers/s390/s390dyn.c
- Orig date:
Wed Apr 11 19:02:28 2001
diff -u --recursive --new-file v2.4.7/linux/drivers/s390/s390dyn.c linux/drivers/s390/s390dyn.c
@@ -112,32 +112,23 @@
if (ioinfo->ui.flags.dval != 1 ||
ioinfo->devno != pdevreg->ci.devno)
continue;
- } else if ((flag & DEVREG_TYPE_DEVCHARS) &&
- (flag & DEVREG_EXACT_MATCH)) {
- if (pdevreg->ci.hc.ctype != sid->cu_type ||
- pdevreg->ci.hc.cmode != sid->cu_model ||
- pdevreg->ci.hc.dtype != sid->dev_type ||
- pdevreg->ci.hc.dmode != sid->dev_model)
- continue;
} else if (flag & DEVREG_TYPE_DEVCHARS) {
- if (!(flag & DEVREG_NO_CU_INFO) &&
- pdevreg->ci.hc.ctype != sid->cu_type)
+ if ( (flag & DEVREG_MATCH_CU_TYPE) &&
+ pdevreg->ci.hc.ctype != sid->cu_type )
+ continue;
+ if ( (flag & DEVREG_MATCH_CU_MODEL) &&
+ pdevreg->ci.hc.cmode != sid->cu_model )
+ continue;
+ if ( (flag & DEVREG_MATCH_DEV_TYPE) &&
+ pdevreg->ci.hc.dtype != sid->dev_type )
+ continue;
+ if ( (flag & DEVREG_MATCH_DEV_MODEL) &&
+ pdevreg->ci.hc.dmode != sid->dev_model )
continue;
-
- if (!(flag & DEVREG_NO_CU_INFO) &&
- !(flag & DEVREG_MATCH_CU_TYPE) &&
- pdevreg->ci.hc.cmode != sid->cu_model)
- continue;
-
- if (!(flag & DEVREG_NO_DEV_INFO) &&
- pdevreg->ci.hc.dtype != sid->dev_type)
- continue;
-
- if (!(flag & DEVREG_NO_DEV_INFO) &&
- !(flag & DEVREG_MATCH_DEV_TYPE) &&
- pdevreg->ci.hc.dmode != sid->dev_model)
- continue;
+ } else {
+ continue;
}
+
return pdevreg;
}
return NULL;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)