redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: dgap: Simplify to set a module type

Browse source 
It is same manner with setting a board type.
After allocating a type of "MNODE", get a token value
set to "module.type".

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2014-08-09 14:39:05 +09:00 committed by Greg Kroah-Hartman
parent f6aa0164cd
commit 3cfa648b12
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/dgap/dgap.c
View file

@ -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;

1
drivers/staging/dgap/dgap.h
View file

@ -1219,7 +1219,6 @@ struct cnode {
char *id;
char *idstr;
long start;
char v_type;
char v_nport;
char v_id;
char v_start;