Commit 3cfa648b authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: dgap: Simplify to set a module type 



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: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6aa0164

drivers/staging/dgap/dgap.c

+7 −19
Original line number Diff line number Diff line
@@ -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;

drivers/staging/dgap/dgap.h

+0 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,6 @@ struct cnode { 
			char *id;

			char *idstr;

			long start;

			char v_type;

			char v_nport;

			char v_id;

			char v_start;