Эх сурвалжийг харах

staging: dgap: remove unused configuration

The IO configuration was not used to configure the board. It was only
read from the configuration file. Stop reading it and also remove the
other related variables defined for it.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sudip Mukherjee 10 жил өмнө
parent
commit
35e942f316

+ 0 - 21
drivers/staging/dgap/dgap.c

@@ -248,7 +248,6 @@ static struct toklist dgap_tlist[] = {
 	{ BEGIN,	"config_begin" },
 	{ BEGIN,	"config_begin" },
 	{ END,		"config_end" },
 	{ END,		"config_end" },
 	{ BOARD,	"board"	},
 	{ BOARD,	"board"	},
-	{ IO,		"io" },
 	{ PCIINFO,	"pciinfo" },
 	{ PCIINFO,	"pciinfo" },
 	{ LINE,		"line" },
 	{ LINE,		"line" },
 	{ CONC,		"conc" },
 	{ CONC,		"conc" },
@@ -662,25 +661,6 @@ static int dgap_parsefile(char **in)
 
 
 			break;
 			break;
 
 
-		case IO:	/* i/o port */
-			if (p->type != BNODE) {
-				pr_err("IO port only valid for boards");
-				return -1;
-			}
-			s = dgap_getword(in);
-			if (!s) {
-				pr_err("unexpected end of file");
-				return -1;
-			}
-			kfree(p->u.board.portstr);
-			p->u.board.portstr = kstrdup(s, GFP_KERNEL);
-			if (kstrtol(s, 0, &p->u.board.port)) {
-				pr_err("bad number for IO port");
-				return -1;
-			}
-			p->u.board.v_port = 1;
-			break;
-
 		case MEM:	/* memory address */
 		case MEM:	/* memory address */
 			if (p->type != BNODE) {
 			if (p->type != BNODE) {
 				pr_err("memory address only valid for boards");
 				pr_err("memory address only valid for boards");
@@ -1296,7 +1276,6 @@ static void dgap_cleanup_nodes(void)
 
 
 		switch (p->type) {
 		switch (p->type) {
 		case BNODE:
 		case BNODE:
-			kfree(p->u.board.portstr);
 			kfree(p->u.board.addrstr);
 			kfree(p->u.board.addrstr);
 			kfree(p->u.board.pcibusstr);
 			kfree(p->u.board.pcibusstr);
 			kfree(p->u.board.pcislotstr);
 			kfree(p->u.board.pcislotstr);

+ 0 - 4
drivers/staging/dgap/dgap.h

@@ -409,7 +409,6 @@
 #define	ID	76
 #define	ID	76
 #define CABLE	77
 #define CABLE	77
 #define CONNECT	78
 #define CONNECT	78
-#define	IO	79
 #define	MEM	80
 #define	MEM	80
 #define DPSZ	81
 #define DPSZ	81
 
 
@@ -1152,8 +1151,6 @@ struct cnode {
 	union {
 	union {
 		struct {
 		struct {
 			char  type;	/* Board Type           */
 			char  type;	/* Board Type           */
-			long  port;	/* I/O Address		*/
-			char  *portstr; /* I/O Address in string */
 			long  addr;	/* Memory Address	*/
 			long  addr;	/* Memory Address	*/
 			char  *addrstr; /* Memory Address in string */
 			char  *addrstr; /* Memory Address in string */
 			long  pcibus;	/* PCI BUS		*/
 			long  pcibus;	/* PCI BUS		*/
@@ -1164,7 +1161,6 @@ struct cnode {
 			char  *id;	/* tty id		*/
 			char  *id;	/* tty id		*/
 			long  start;	/* start of tty counting */
 			long  start;	/* start of tty counting */
 			char  *method;  /* Install method       */
 			char  *method;  /* Install method       */
-			char  v_port;
 			char  v_addr;
 			char  v_addr;
 			char  v_pcibus;
 			char  v_pcibus;
 			char  v_pcislot;
 			char  v_pcislot;