9os

commit 21fad6d19fbb4da678d10e34640cd47adf5eb469
parent 940d405c2261873c6c773e322db275627618dcf5
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Mon, 18 Feb 2019 16:27:36 +0000

[drivers] Remove slash from devdata

Change-Id: I639c0834a23d198fe9b768da898849a7a7d3f6cf

Diffstat:
M
drivers/dev.c
 | 
10
+++-------
M
drivers/dev.h
 | 
1
-

2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/dev.c b/drivers/dev.c
@@ -8,6 +8,7 @@
 #include "dev.h"
 
 static Chan fdset[NR_CHANS];
+static Chan slash;
 
 static Chan *
 newchan(void)
@@ -122,12 +123,11 @@ namec(const char *name, int mode)
 	int type;
 	const char *s;
 	Chan *c;
-	struct devdata *dinfo = devdata();
 	char elem[NAMELEN];
 
 	switch (name[0]) {
 	case '/':
-		c = clone(&dinfo->slash, NULL);
+		c = clone(&slash, NULL);
 		s = name;
 		break;
 	case '#':
@@ -387,12 +387,8 @@ err0:
 void
 idev(void)
 {
-	struct devdata *dinfo;
 	Chan *c, *clim;
 
-	dinfo = alloc(sizeof(*dinfo));
-	devinfo = dinfo;
-
 	clim = &fdset[NR_CHANS];
 	for (c = fdset; c < clim; c++)
 		c->type = NODEV;
@@ -400,7 +396,7 @@ idev(void)
 	if ((c = devattach(NULL, '/')) == NULL)
 		panic("idev:attach");
 
-	if (!clone(c, &dinfo->slash))
+	if (!clone(c, &slash))
 		panic("idev:clone");
 
 	chanclose(c);
diff --git a/drivers/dev.h b/drivers/dev.h
@@ -44,7 +44,6 @@ struct attr {
 };
 
 struct devdata {
-	Chan slash;
 	Uart *uarts[NR_UARTS];
 };