diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-08-09 14:38:41 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 12:23:06 -0700 |
| commit | f6aa0164cd3b1c5192e87f5651ec382c3bc3abac (patch) | |
| tree | 3003b2fbe78a4e896ad3aafe8eef5750f9080a06 /drivers/staging/dgap | |
| parent | 77a4492fcc5696efd667cf698cb806ae846ea163 (diff) | |
staging: dgap: Simplify to set a concentrator type
It is same manner with setting a board type.
For example of config file for concentrator,
"conc ccon" or
"conc epcon"
After allocating a type of "CNODE" then set a type of concentrator.
So remove cases in swith statement, just get a token from string
and set to "conc.type". And also it doesn't need to "conc.v_type".
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -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 7fb54d18e32b..1d27976be1aa 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -6387,6 +6387,7 @@ static int dgap_parsefile(char **in) for (; ;) { int board_type = 0; + int conc_type = 0; rc = dgap_gettok(in); if (rc == 0) { @@ -6719,24 +6720,15 @@ static int dgap_parsefile(char **in) else brd->u.board.conc1++; - break; - - case CX: /* c/x type concentrator */ - if (p->type != CNODE) { - dgap_err("cx only valid for concentrators"); + conc_type = dgap_gettok(in); + if (conc_type == 0 || conc_type != CX || + conc_type != EPC) { + dgap_err("failed to set a type of concentratros"); return -1; } - p->u.conc.type = CX; - p->u.conc.v_type = 1; - break; - case EPC: /* epc type concentrator */ - if (p->type != CNODE) { - dgap_err("cx only valid for concentrators"); - return -1; - } - p->u.conc.type = EPC; - p->u.conc.v_type = 1; + p->u.conc.type = conc_type; + break; case MOD: /* EBI module */ @@ -7200,10 +7192,6 @@ static int dgap_checknode(struct cnode *p) return 0; case CNODE: - if (p->u.conc.v_type == 0) { - dgap_err("concentrator type not specified"); - return 1; - } if (p->u.conc.v_speed == 0) { dgap_err("concentrator line speed not specified"); return 1; diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index c01aa2820660..800f4077fe36 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -1206,7 +1206,6 @@ struct cnode { char *id; char *idstr; long start; - char v_type; char v_connect; char v_speed; char v_nport; |