diff options
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 26 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap.h | 1 |
2 files changed, 7 insertions, 20 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 1d27976..a54b8d4 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -6388,6 +6388,7 @@ static int dgap_parsefile(char **in) for (; ;) { int board_type = 0; int conc_type = 0; + int module_type = 0; rc = dgap_gettok(in); if (rc == 0) { @@ -6762,24 +6763,15 @@ static int dgap_parsefile(char **in) else brd->u.board.module1++; - break; - - case PORTS: /* ports type EBI module */ - if (p->type != MNODE) { - dgap_err("ports only valid for EBI modules"); + module_type = dgap_gettok(in); + if (module_type == 0 || module_type != PORTS || + module_type != MODEM) { + dgap_err("failed to set a type of module"); return -1; } - p->u.module.type = PORTS; - p->u.module.v_type = 1; - break; - case MODEM: /* ports type EBI module */ - if (p->type != MNODE) { - dgap_err("modem only valid for modem modules"); - return -1; - } - p->u.module.type = MODEM; - p->u.module.v_type = 1; + p->u.module.type = module_type; + break; case CABLE: @@ -7207,10 +7199,6 @@ static int dgap_checknode(struct cnode *p) return 0; case MNODE: - if (p->u.module.v_type == 0) { - dgap_err("EBI module type not specified"); - return 1; - } if (p->u.module.v_nport == 0) { dgap_err("number of ports on EBI module not specified"); return 1; diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index 800f407..52e1d64 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -1219,7 +1219,6 @@ struct cnode { char *id; char *idstr; long start; - char v_type; char v_nport; char v_id; char v_start; |