9os

commit 1b28b899cb089e23b2c776b2922ad19a7e2ae71d
parent e94e505885d87d745ba98429bf082952c3e53ac1
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu, 28 Feb 2019 15:17:03 +0000

[dev] Simplify walk functions

namec() is already checking that a qid is a directory before
calling the walk function, so we can simplify these functions.

Change-Id: Ib4bb359f9715d0ce06eb7df02399504331eb0ec4

Diffstat:
M
drivers/devblob.c
 | 
2
--
M
drivers/devroot.c
 | 
2
+-
M
drivers/devuart.c
 | 
17
+----------------

3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/drivers/devblob.c b/drivers/devblob.c
@@ -26,8 +26,6 @@ static int nblobs;
 static int
 blobwalk(Chan *c, const char *name)
 {
-	if ((c->qid & ~CHDIR) != Qblobfs)
-		return 0;
 	return devwalk(c, name, blobfstab, nblobs+1, devgen);
 }
 
diff --git a/drivers/devroot.c b/drivers/devroot.c
@@ -36,9 +36,9 @@ rootgen(Chan *c, const Dirtab *tab, int ntab, int n, Dir *dir)
 		tab = devfstab;
 		ntab = NELEM(devfstab);
 		break;
-	case Qblobs:
 	case Qdevuart:
 	case Qrealm:
+	case Qblobs:
 		return 0;
 	default:
 		panic("roottab");
diff --git a/drivers/devuart.c b/drivers/devuart.c
@@ -27,22 +27,7 @@ static Uart *uarts[NR_UARTS];
 static int
 uartwalk(Chan *c, const char *name)
 {
-	Qid qid;
-
-	qid = c->qid & ~CHDIR;
-	switch (qid) {
-	case Quartfs:
-		return devwalk(c,
-		               name,
-		               dirtab, NELEM(dirtab),
-		               devgen);
-	case Qraw:
-	case Qctl:
-		errno = ENOENT;
-		return 0;
-	default:
-		panic("uartwalk");
-	}
+	return devwalk(c, name, dirtab, NELEM(dirtab), devgen);
 }
 
 static Uart *